geethkokila
65cb12b5ac
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
2017-01-03 14:13:49 +05:30
Milan Perera
02d75b757c
Fixed conflicts and merged
2017-01-03 10:37:46 +05:30
GPrathap
f508bcfd0e
corrected method name
2017-01-01 22:03:50 +05:30
GPrathap
649879f998
removed setting APIs secured as default.
...
Because if secured is enabled, it is to be needed to provided parameters which are related to basic oauth, when this is false, jwt token is being used.
2017-01-01 21:13:53 +05:30
WSO2 Builder
6aea6195e9
[maven-release-plugin] prepare for next development iteration
2016-12-23 19:20:14 +00:00
WSO2 Builder
3db5b289ac
[maven-release-plugin] prepare release v2.0.5
2016-12-23 19:18:26 +00:00
WSO2 Builder
ed47094964
[maven-release-plugin] prepare for next development iteration
2016-12-23 07:05:25 +00:00
WSO2 Builder
8d409a7248
[maven-release-plugin] prepare release v2.0.4
2016-12-23 07:00:40 +00:00
Ace
1d2a5dc9ef
Updating identity/auth-saml dependencies to latest
2016-12-22 10:58:59 +05:30
geethkokila
83b9fd46cd
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
2016-12-20 16:59:03 +05:30
Rasika Perera
a633547d19
IOTS-340: Fixing consumer key and consumer secret is null on api-mgt-ext
2016-12-20 13:03:19 +05:30
geethkokila
8ca28fa1fd
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
2016-12-19 13:47:27 +05:30
Rasika Perera
1465c56822
Revert "[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit f9b6939cb7 .
2016-12-19 12:39:56 +05:30
Ace
47d8baccf7
upgrading to latest version of identity
2016-12-19 11:38:03 +05:30
geethkokila
8e2432c47b
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
2016-12-19 10:04:18 +05:30
geethkokila
200740eca6
Partial commit for the git update
2016-12-19 09:58:19 +05:30
WSO2 Builder
f9b6939cb7
[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4
2016-12-19 09:06:04 +05:30
Rasika Perera
42930fe8c4
Revert "[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit 78b9052c37 .
2016-12-19 08:45:19 +05:30
WSO2 Builder
78b9052c37
[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4
2016-12-16 17:03:06 +05:30
Megala
d4e9c43ff1
Fixing race condition in creating and subscribing application in api-manager side
2016-12-16 14:13:40 +05:30
amalhub
7e90fde461
IOTS-292: Adding new filter configs
2016-12-14 15:23:59 +05:30
amalhub
0bd298e6d7
IOTS-292: Code refactoring
2016-12-14 15:23:48 +05:30
amalhub
871970002a
IOTS-292: Adding android cert verification for gateway handler
2016-12-14 15:23:36 +05:30
amalhub
610163d705
IOTS-292: Adding IOS synapse config for gatway change
2016-12-14 15:23:24 +05:30
amalhub
d00817268e
IOTS-292: Adding the api-mgt handler for gateway change
2016-12-14 15:23:04 +05:30
Milan Perera
bcbf61a886
Fixed conflicts
2016-12-14 08:50:17 +05:30
Milan Perera
36ee55f493
Implemented permission-scope mapping for IoTs
2016-12-14 08:45:42 +05:30
Milan Perera
dd353e1bfb
Commiting permission-scope mapping improvements
2016-12-08 20:30:49 +05:30
WSO2 Builder
a59edee410
[maven-release-plugin] prepare for next development iteration
2016-12-08 14:39:00 +00:00
WSO2 Builder
8f9b21b41b
[maven-release-plugin] prepare release v2.0.3
2016-12-08 14:37:11 +00:00
geethkokila
d911281ad1
Merging master branch with release-2.0.x
2016-12-08 12:34:50 +05:30
GPrathap
7807ed77da
removed hardcoded validity period while creating application in APIM
2016-12-05 09:50:10 +05:30
WSO2 Builder
df4c13ec72
[maven-release-plugin] prepare for next development iteration
2016-12-05 08:35:51 +05:30
WSO2 Builder
1677beecac
[maven-release-plugin] prepare release v2.0.2
2016-12-05 08:35:51 +05:30
GPrathap
c969013ca2
added new property : validity Period
2016-11-30 12:33:36 +05:30
WSO2 Builder
8431b30ddc
[maven-release-plugin] prepare for next development iteration
2016-11-25 08:06:30 +00:00
WSO2 Builder
ae2e283f14
[maven-release-plugin] prepare release v2.0.1
2016-11-25 07:43:34 +00:00
ayyoob
3fb42ef32e
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
2016-11-21 19:16:32 +05:30
ayyoob
fede8ec409
few changes after testing with authoriser
2016-11-21 19:13:59 +05:30
GPrathap
6efc5bc1ed
removed @API and @Permission annotations
2016-11-20 19:10:45 +05:30
ayyoob
fe263efe60
changed device access verification approach
2016-11-20 02:37:37 +05:30
WSO2 Builder
19c1b3566d
[maven-release-plugin] prepare for next development iteration
2016-11-16 12:18:48 +00:00
WSO2 Builder
cff6e242c8
[maven-release-plugin] prepare release v2.0.0
2016-11-16 12:16:25 +00:00
charitha
a6064d2561
Update component versions for IoTS-1.0.0 release
2016-11-16 13:32:13 +05:30
charitha
ac30e7eb3e
Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
2016-11-01 14:47:21 +05:30
WSO2 Builder
9517a3d30f
[maven-release-plugin] prepare for next development iteration
2016-10-31 10:34:22 +00:00
WSO2 Builder
a8568299b9
[maven-release-plugin] prepare release v1.2.6
2016-10-31 10:32:11 +00:00
ayyoob
3140c36f7b
added missing license headers
2016-10-25 13:57:16 +05:30
sinthuja
a6203845c9
Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service.
2016-10-24 16:37:00 +05:30
sinthuja
00e57bd800
Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service.
2016-10-24 16:31:41 +05:30
WSO2 Builder
27a2c9b979
[maven-release-plugin] prepare for next development iteration
2016-10-18 12:17:27 +00:00
WSO2 Builder
eae935f91c
[maven-release-plugin] prepare release v1.2.5
2016-10-18 12:09:16 +00:00
WSO2 Builder
6a55e1be83
[maven-release-plugin] prepare for next development iteration
2016-10-17 14:15:22 +00:00
WSO2 Builder
11c2e59f61
[maven-release-plugin] prepare release v1.2.4
2016-10-17 14:13:25 +00:00
ayyoob
852ea00403
refactored method name
2016-10-09 19:10:43 +05:30
ayyoob
5727886ea1
few changes after apimgt integration
2016-10-09 03:16:02 +05:30
harshanl
b1e140b58e
Removed unnecessary imports
2016-09-30 10:58:00 +05:30
Chatura Dilan Perera
c16cc4cae1
[maven-release-plugin] prepare for next development iteration
2016-09-29 20:33:07 +05:30
Chatura Dilan Perera
ed4bca7032
[maven-release-plugin] prepare release v1.2.2
2016-09-29 20:32:59 +05:30
Ace
154a6082ce
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
...
# Conflicts:
# features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
2016-09-22 19:08:21 +05:30
Chatura Dilan Perera
50d8885f8b
[maven-release-plugin] prepare for next development iteration
2016-09-19 18:54:48 +05:30
Chatura Dilan Perera
a00d6aafd4
[maven-release-plugin] prepare release v1.2.1
2016-09-19 18:54:38 +05:30
Ace
6a8a5cbd5a
Merging with master
2016-09-19 12:21:41 +05:30
Ace
1dfb8e22e1
Updating to latest appm/apim/identity dependencies
2016-09-14 17:23:09 +05:30
Chatura Dilan Perera
de23a8cf27
[maven-release-plugin] prepare for next development iteration
2016-09-09 20:18:25 +05:30
Chatura Dilan Perera
8905fae0d9
[maven-release-plugin] prepare release v1.2.0
2016-09-09 20:18:12 +05:30
Chatura Dilan Perera
2d5262e21e
[maven-release-plugin] prepare for next development iteration
2016-09-09 17:10:19 +05:30
Chatura Dilan Perera
5ccd752404
[maven-release-plugin] prepare release v1.2.0
2016-09-09 17:10:04 +05:30
mharindu
115099c8fe
Implemented permission based authorization
2016-09-09 02:56:21 +05:30
mharindu
24930b3042
Partial commit of migration
2016-09-05 16:37:09 +05:30
mharindu
d7e8cc30dd
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.7
2016-08-24 14:56:06 +05:30
Chatura Dilan Perera
8b17cbb339
Fix conflicts
2016-08-19 15:00:57 +05:30
Chatura Dilan Perera
654e1d9938
[maven-release-plugin] prepare for next development iteration
2016-08-18 22:09:42 +05:30
Chatura Dilan Perera
aa24821667
[maven-release-plugin] prepare release v1.1.2
2016-08-18 22:09:33 +05:30
ayyoob
892d5cee20
avoided lazy inialization
2016-08-15 15:13:39 +05:30
mharindu
f5609cc8ff
Adding carbon 4.4.7 migration changes
2016-08-11 12:19:05 +05:30
mharindu
bd41e4f4fb
Implemented scope based authorization in device-mgt UI module
2016-08-09 19:08:07 +05:30
mharindu
acf6d7ecd7
Fixed conflicts and merged
2016-08-08 10:42:30 +05:30
mharindu
ed4c762bfd
Refactored scopes
2016-08-04 17:46:46 +05:30
Prabath Abeysekara
cc90bef42b
Merge pull request #318 from Securepoint/master
...
Minor bug fixies and code improvements
2016-08-03 14:12:24 +05:30
mharindu
564c2b280e
Fixed conflicts and merged
2016-07-26 16:38:51 +05:30
mharindu
19275634a1
Fixed webapp name resolving issue
2016-07-25 12:04:30 +05:30
mharindu
827567733c
Fixed scope update issue in API update
2016-07-22 16:41:40 +05:30
mharindu
bdec8880bb
Fixed conflicts and merged
2016-07-18 20:22:27 +05:30
mharindu
9932f061fb
Fixed webapp name resolving issue
2016-07-18 20:09:16 +05:30
mharindu
186432e1df
Fixed webapp name resolving issue
2016-07-18 20:08:51 +05:30
Timo Briddigkeit
ed07774552
Fixed literal string comparison.
...
This line is in the form of
String str = ...
str.equals("someOtherString");
//or
str.compareTo("someOtherString");
A NullPointerException may occur if the String variable str is null. If instead the code was restructured to
String str = ...
"someOtherString".equals(str);
//or
"someOtherString".compareTo(str);
that is, call equals() or compareTo() on the string literal, passing the variable as an argument, this exception could never happen as both equals() and compareTo() check for null.
2016-07-15 16:25:31 +02:00
Timo Briddigkeit
ee5b077e6a
Fixed various XML External Entity (XXE) attack vulnerabilities
2016-07-13 15:02:11 +02:00
mharindu
0f904e21d8
Fixed conflicts and merged
2016-07-11 22:12:15 +05:30
Chatura Dilan
4ec11e8c08
[maven-release-plugin] prepare for next development iteration
2016-07-08 19:11:40 +05:30
Chatura Dilan
ffedcac543
[maven-release-plugin] prepare release v1.1.1
2016-07-08 19:09:55 +05:30
mharindu
ac75ff1d71
Fixed conflict and merged
2016-07-03 15:09:05 +05:30
mharindu
49623a4693
Implemented scope based authorization
2016-07-03 15:03:47 +05:30
prabathabey
49ce42b797
Code cleanup
2016-06-30 18:19:11 +05:30
Ruwan
6ce7f8c65a
Merge pull request #307 from ayyoob/transport
...
Few changes added after testing with the cluster
2016-06-27 09:39:17 +05:30
ayyoob
ba6e202442
Few changes added after testing with the cluster
2016-06-27 00:12:46 +05:30
prabathabey
aeb4ad3295
Merging rest-api-improvements branch to master
2016-06-21 15:52:35 +05:30
ayyoob
52e84273d1
added profile check before publishing apis
2016-06-08 22:38:49 +05:30
inoshperera
3c73217e96
fixing osgi issue related to usage of carbon context. And adding api publishing check from config.
2016-05-27 19:15:46 +05:30
ayyoob
c9cd051a6b
subscribed to super tenant apis
2016-05-27 02:20:15 +05:30
mharindu
52388ed33d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
2016-05-26 12:44:36 +05:30
mharindu
106be76118
Fixed issues of API publishing to gateway
2016-05-26 12:41:20 +05:30
ayyoob
feaf6b2b35
added webapp publisher missing bundle
2016-05-24 15:35:48 +05:30
mharindu
50d35a90f8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-23 16:51:38 +05:30
mharindu
66ccad65cf
Partial commit for APIM Gateway migration
2016-05-23 16:51:26 +05:30
mharindu
3e291c5b13
[maven-release-plugin] prepare for next development iteration
2016-05-20 16:43:16 +05:30
mharindu
9549ac446b
[maven-release-plugin] prepare release v1.1.0
2016-05-20 16:43:02 +05:30
mharindu
2dbcf86f3d
Added retrying mechanism to webapp publisher
2016-05-20 15:52:50 +05:30
mharindu
968cb00f35
Fixed conflicts and merged
2016-05-19 00:42:14 +05:30
mharindu
83c2a1f0ee
Fixed issues in api publishing
2016-05-19 00:30:41 +05:30
mharindu
9f93570b29
Fixed issues in webapp-publisher
2016-05-18 22:00:16 +05:30
ayyoob
ba47af3186
added api application registration filter
2016-05-18 19:33:04 +05:30
ayyoob
2ceff61811
refactors jet authenticator to pick tenant specific key store
2016-05-16 19:44:31 +05:30
mharindu
83ec18c38d
Removed external dependancies from webapp publisher component
2016-05-16 14:20:34 +05:30
mharindu
c68b92c7b4
Fixed conflicts
2016-05-16 14:12:28 +05:30
mharindu
9a4b904702
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
2016-05-16 11:55:35 +05:30
mharindu
659cdcc50c
Implemented extended scope validator and improved webapp publisher to support Synapse
2016-05-16 11:47:04 +05:30
mharindu
f2ac5c5cad
Implemented extended scope validator and improved webapp publisher to support Synapse
2016-05-16 11:46:30 +05:30
Ace
cbc505c459
changing profile name
2016-05-15 01:35:57 +05:30
Ace
4517a7f1aa
Making API publish destination configurable and other changes
2016-05-15 01:15:11 +05:30
Ace
6d9f2f92a4
Making API publish destination configurable
2016-05-15 01:12:45 +05:30
mharindu
5ad8d2938e
Fixed issues of publishing APIs to synapse gateway
2016-05-11 10:50:32 +05:30
mharindu
6db9b21623
Code cleanup in webapp publisher
2016-04-28 14:49:34 +05:30
mharindu
6f8bb64e1c
Fixed merge conflicts
2016-04-28 11:59:03 +05:30
mharindu
ffc7542d4d
Modified authorization to support API gateway
2016-04-28 11:36:34 +05:30
Ace
a06327b731
refactoring and bug fixes
2016-04-27 20:43:13 +05:30
Ace
985d07cbc7
Cleaning up code
2016-04-27 14:53:12 +05:30
ayyoob
64bd0fc061
removed fix for web app publishing start up issue when synapse gateway is used
2016-04-18 17:16:51 +05:30
ayyoob
12db341d33
few changes on web app publisher after testing
2016-04-18 03:00:06 +05:30
ayyoob
d3418462d9
few changes in api manager application registration
2016-04-17 12:18:49 +05:30
ayyoob
9d4defaa01
check whether the subscriber exist before creating
2016-04-15 23:10:11 +05:30
ayyoob
afe965e787
adding code review changes on JWT and API App registration
2016-04-14 19:55:55 +05:30
ayyoob
1b4a9227d8
merged web app publisher code and refactored jwt client extension to adhere to new artefact name
2016-03-31 04:24:30 +05:30
charithag
40f863fd57
Fix bundle imports for java 8
2016-03-30 10:00:56 +05:30
charithag
3e4ccf6337
Add missing features and component from IoTS-1.0.0-M4
2016-03-30 01:44:04 +05:30
geethkokila
e9da24c9e8
Changing the snapshot versions from 1.0.4 to 1.1.0
2016-03-24 11:41:52 +05:30
geethkokila
e0e0a57c11
[maven-release-plugin] prepare for next development iteration
2016-01-05 18:15:38 +05:30
geethkokila
cebb88e712
[maven-release-plugin] prepare release v1.0.3
2016-01-05 18:15:28 +05:30
geethkokila
e66d291947
[maven-release-plugin] prepare for next development iteration
2015-12-30 14:19:05 +05:30
geethkokila
f416a73e75
[maven-release-plugin] prepare release v1.0.2
2015-12-30 14:18:57 +05:30
geethkokila
185a59fbd4
[maven-release-plugin] prepare for next development iteration
2015-12-23 22:39:29 +05:30
geethkokila
b3580d754b
[maven-release-plugin] prepare release v1.0.1
2015-12-23 22:39:20 +05:30
geethkokila
4e9255fbc9
[maven-release-plugin] prepare for next development iteration
2015-12-22 08:28:42 +05:30
geethkokila
ceb60adb34
[maven-release-plugin] prepare release v1.0.0
2015-12-22 08:28:33 +05:30
Kamidu Sachith
2d23eb86eb
Improve runtime performance
2015-12-21 16:38:42 +05:30
harshanl
1c8bb7551d
Refactored Dynamic-client registration service to use AppMgt osgi service
2015-10-07 23:15:17 +05:30
harshanl
302eb3a8a9
Merged changes
2015-10-07 00:00:28 +05:30
harshanl
648d8ec209
Added OAuth scope validator & fixed DataHolders
2015-10-05 11:28:47 +05:30
prabathabey
bce52e54a3
Upgrading dependency versions to their respective latests
2015-10-01 19:24:48 +05:30
prabathabey
dc2680ac5e
Making APIPublisher util compose the relevant API endpoint url programmatically
2015-09-02 21:21:51 +05:30
prabathabey
256c42243f
Improving APIPublisher implementation
2015-09-02 21:12:06 +05:30
prabathabey
9288e3846d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-09-02 20:26:01 +05:30
prabathabey
4334994b36
Fixing issues encountered in APIPublisher implementation
2015-09-02 20:25:52 +05:30
harshanl
d7ea5625bc
Fixed apimgt publisher component issues
2015-09-02 20:24:33 +05:30
prabathabey
b298407160
Fixing improper parent configurations found in apimgt.extensions component and feature
2015-07-25 13:29:57 +05:30
prabathabey
1716c2c7f6
Making apimgt extensions module a separate component/feature pair
2015-07-25 12:41:18 +05:30