Commit Graph

4268 Commits

Author SHA1 Message Date
prabathabey
733ae8ed10 Adding proper dependency exclusions to poms, making MobileFeatureDAOTestSuite use jdbc pooling instead of dbcp and making testdbconfig.xml to be compliant with platform naming standards 2015-01-26 23:57:06 +05:30
Dulitha Wijewantha
1a78ae08c2 Added latest IS configuration to the SSO service section. 2015-01-26 22:51:03 +05:30
Dulitha Wijewantha
746e5209df * Added copying tasks for the authentication endpoint web app, sso-config, identity configs
* Added claim mgt feature
* Added relevant configuration files
2015-01-26 22:49:04 +05:30
harshanL
5b49fd0976 Added the maven archetype to create android mdm-agent project 2015-01-26 18:30:13 +05:30
Geeth Munasinghe
3017d53432 Adding saml sso feature 2015-01-23 23:49:16 +05:30
inosh-perera
6a74d401e1 Merge branch 'master' of https://github.com/wso2/product-mdm 2015-01-23 22:55:33 +05:30
Geeth Munasinghe
6ac5cb1438 fixing cdm jaggery app not ddploying issue 2015-01-23 22:52:07 +05:30
inosh-perera
53c2abd574 Merge branch 'master' of https://github.com/wso2/product-mdm 2015-01-23 22:48:30 +05:30
inosh-perera
8e4e434d0d added adroid code from old repository, oauth basic login fixed 2015-01-23 22:46:43 +05:30
Geeth Munasinghe
5883944e23 Merge branch 'master' of https://github.com/wso2/product-mdm 2015-01-23 22:34:53 +05:30
prabathabey
19adb9482f Merge branch 'master' of https://github.com/wso2/product-mdm 2015-01-23 22:31:47 +05:30
prabathabey
95e538c324 Fixing issues related to copying API manager publisher and store related jaggery webapps 2015-01-23 22:31:34 +05:30
Geeth Munasinghe
38b839a4a9 Merge branch 'master' of https://github.com/dulichan/product-mdm 2015-01-23 22:31:17 +05:30
Geeth Munasinghe
c93f99d970 Merge branch 'master' of https://github.com/wso2/product-mdm 2015-01-23 22:22:31 +05:30
Geeth Munasinghe
57482a7ae3 Merge branch 'master' of https://github.com/manojgunayadev/product-mdm 2015-01-23 22:19:19 +05:30
prabathabey
dec7419e41 Fixing self-registration feature installation related issues 2015-01-23 22:17:26 +05:30
prabathabey
fb72682da0 Adding API Publisher and Store Features to p2-profile 2015-01-23 22:06:06 +05:30
Dulitha Wijewantha
5b68949c41 Merge branch 'master' of github.com:wso2/product-mdm 2015-01-23 22:03:18 +05:30
Dulitha Wijewantha
3f7b93163b * Added a description to the feature implementation
* Added the feature insert, changed the feature_id to int and added device_type to features
* Included the updated database file
* Developed the feature to view device features
* Developed the implementation to call the Operation Manager from the UI
2015-01-23 22:03:01 +05:30
Geeth Munasinghe
7fb84d4a04 Merge branch 'master' of https://github.com/wso2/product-mdm 2015-01-23 21:37:27 +05:30
Geeth Munasinghe
9a89aa8112 Adding the sso features and changing the filter.properties 2015-01-23 21:37:16 +05:30
prabathabey
f296fb763e Configuring product.name and product.version variables to be replaced with appropriate filter properties 2015-01-23 21:36:02 +05:30
prabathabey
e9ebd88445 Configuring logging for test cases 2015-01-23 21:29:32 +05:30
manoj
7dc6a987c7 Remove license rxt file from MDM 2015-01-23 21:19:26 +05:30
manoj
bdb522d0e5 Delete license rxt 2015-01-23 21:18:54 +05:30
prabathabey
b17b514d11 Resolving conflicts 2015-01-23 21:08:58 +05:30
prabathabey
da34270a61 Fixing API Manager related issues 2015-01-23 20:53:50 +05:30
harshanL
e40424c758 Added copying mobile db scripts to bin.xml & refactored code 2015-01-23 19:44:16 +05:30
Dulitha Wijewantha
69a822c8d1 Merge branch 'master' of github.com:wso2/product-mdm 2015-01-23 19:07:52 +05:30
Dulitha Wijewantha
899662c5d5 Merge branch 'master' of github.com:wso2/product-mdm
Conflicts:
	components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileFeatureDAO.java
2015-01-23 19:07:21 +05:30
Geeth Munasinghe
b03443a30f Merging the changes of Manoj
Merge branch 'manojgunayadev-master'
2015-01-23 18:55:26 +05:30
Geeth Munasinghe
1cdbfd84e0 Merge branch 'master' of https://github.com/manojgunayadev/product-mdm 2015-01-23 18:55:03 +05:30
Geeth Munasinghe
8a3ab46c0d Merge branch 'master' of https://github.com/manojgunayadev/product-mdm into manojgunayadev-master 2015-01-23 18:41:43 +05:30
Dulitha Wijewantha
df09c4bd3c * Added method to the mobile feature DAO to get features by type
* Changed method - getFeaturePropertyOfFeature to accept a string
* Added Device Type to the Feature DAO implementations
* Changed Device Feature properties DAO for Int
* Implemented the get feature by type to android operation manager
2015-01-23 18:39:28 +05:30
manoj
329f956f3d License Management 2015-01-23 18:19:21 +05:30
harshanL
54e827ce68 Added unit-tests & refactored the code 2015-01-23 15:58:06 +05:30
Geeth Munasinghe
845c9f8998 changing the read me file 2015-01-23 14:45:14 +05:30
Geeth Munasinghe
f4a40a2fd1 changing the read me file 2015-01-23 14:43:45 +05:30
Geeth Munasinghe
fd631f9563 Nerging Dulitha's changes
Merge branch 'dulichan-master'
2015-01-23 14:14:38 +05:30
Geeth Munasinghe
cf8eaaef41 Merge branch 'master' of https://github.com/dulichan/product-mdm 2015-01-23 14:13:54 +05:30
Geeth Munasinghe
46c1218259 Merge branch 'master' of https://github.com/dulichan/product-mdm into dulichan-master 2015-01-23 13:56:36 +05:30
manoj
40489f986d Merge remote-tracking branch 'upstream/master' 2015-01-23 13:54:27 +05:30
manoj
4974d49320 License Management 2015-01-23 13:49:27 +05:30
Dulitha Wijewantha
f1193b5647 Fixed indentation. UI module changes 2015-01-23 12:47:25 +05:30
Geeth Munasinghe
20a228992f Adding org.wso2.carbon.identity.self.registration.server.feature to p2 profile gen 2015-01-23 12:29:17 +05:30
Dulitha Wijewantha
ba8f6621a4 Merge branch 'master' of github.com:dulichan/product-mdm 2015-01-23 11:42:11 +05:30
Dulitha Wijewantha
24184b48a7 Reverted changes back to the list implementation. The Map conversion is not properly supported in CXF 2015-01-23 11:40:06 +05:30
Dulitha Wijewantha
dcf222d2c1 Reverted changes back to the list implementation. The Map conversion is not properly supported in CFX 2015-01-23 11:29:33 +05:30
manoj
b702a72b2f Merge remote-tracking branch 'upstream/master' 2015-01-23 11:04:05 +05:30
manoj
b96d561ef0 License Manaproduct/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.javagement 2015-01-23 11:02:25 +05:30