Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump testng from 6.9.10 to 7.4.0 #55

Open
wants to merge 5,589 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5589 commits
Select commit Hold shift + click to select a range
97c9c25
Added changes
vithu30 Jul 20, 2018
ef2bcf7
Added name validation in update page
vithu30 Jul 23, 2018
c429021
Refactored
vithu30 Jul 23, 2018
132bc3a
First commit
vithu30 Jul 24, 2018
bc45c51
Fix review comments
dushaniw Jul 25, 2018
c23b435
Merge pull request #5538 from dushaniw/master
malinthaprasan Jul 25, 2018
eac9622
fixing minor issue
tharindu1st Jul 30, 2018
6ae3f2e
Merge pull request #5567 from tharindu1st/integration-test
tharindu1st Jul 30, 2018
ea15f12
[WSO2 Release] [Jenkins #2856] [Release 7.0.162] prepare release v7.0…
wso2-jenkins-bot Jul 30, 2018
14ef3d8
[WSO2 Release] [Jenkins #2856] [Release 7.0.162] prepare for next dev…
wso2-jenkins-bot Jul 30, 2018
4333f75
Merge pull request #5550 from vithu30/master
tmkasun Jul 31, 2018
679a117
[WSO2 Release] [Jenkins #2858] [Release 7.0.163] prepare release v7.0…
wso2-jenkins-bot Jul 31, 2018
2fbe1b7
[WSO2 Release] [Jenkins #2858] [Release 7.0.163] prepare for next dev…
wso2-jenkins-bot Jul 31, 2018
9e2e5fb
Added self-sign up feature
vithu30 Aug 3, 2018
17ba6ff
Added license header
vithu30 Aug 3, 2018
bbcb683
Refactored comment
vithu30 Aug 3, 2018
f66f2c5
Refactored
vithu30 Aug 3, 2018
952ed13
Removed extra line
vithu30 Aug 3, 2018
f0e5f32
Merge branch 'master' of https://github.com/wso2/carbon-apimgt
vithu30 Aug 3, 2018
a53346b
Added formatting changes
vithu30 Aug 3, 2018
cb19cf5
Added minor fix
vithu30 Aug 3, 2018
6084229
Refactored
vithu30 Aug 5, 2018
2e47834
Refactored
vithu30 Aug 6, 2018
35da348
Fixed issue
vithu30 Aug 6, 2018
94c5a52
Added password validation
vithu30 Aug 6, 2018
8726f79
Refactored
vithu30 Aug 6, 2018
327e0e6
Refactored
vithu30 Aug 7, 2018
147a076
Altered hard coded values used in alignment
vithu30 Aug 7, 2018
5dcc749
Refactor DAOFactory
pubudu538 Aug 10, 2018
5b97016
Merge pull request #5580 from pubudu538/master
pubudu538 Aug 13, 2018
5b6e155
[WSO2 Release] [Jenkins #2860] [Release 7.0.164] prepare release v7.0…
wso2-jenkins-bot Aug 13, 2018
6130838
[WSO2 Release] [Jenkins #2860] [Release 7.0.164] prepare for next dev…
wso2-jenkins-bot Aug 13, 2018
e6f4943
Fix stylig and eslin issues
tmkasun Jul 16, 2018
58a748c
Update Material-UI to stable 1.40 and its dependancies and update web…
tmkasun Jul 18, 2018
c54037e
Migrate Material-UI version to stable 1.4.0
tmkasun Aug 5, 2018
a52af3b
Refactor MUI imports to comply with MUI 1.x
tmkasun Aug 13, 2018
c29c12d
Add complete data dir to eslint
tmkasun Aug 13, 2018
55b2ce8
Fix exlint code styling issues
tmkasun Aug 13, 2018
df2caf2
Merge pull request #5582 from tmkasun/APIM3_NEW
tmkasun Aug 14, 2018
9858184
[WSO2 Release] [Jenkins #2862] [Release 7.0.165] prepare release v7.0…
wso2-jenkins-bot Aug 14, 2018
3f75885
[WSO2 Release] [Jenkins #2862] [Release 7.0.165] prepare for next dev…
wso2-jenkins-bot Aug 14, 2018
de5a952
Fix product-apim 1989: Add i18n support for publisher app
Rajith90 Aug 13, 2018
9186622
resolve merge conflicts
Rajith90 Aug 14, 2018
f14ed4d
Merge pull request #5583 from Rajith90/new_c5_master
Rajith90 Aug 14, 2018
20204f1
Fix regression issues in methods rename in Utils.js
tmkasun Aug 14, 2018
fa84a9f
[WSO2 Release] [Jenkins #2864] [Release 7.0.166] prepare release v7.0…
wso2-jenkins-bot Aug 14, 2018
94ecd5b
[WSO2 Release] [Jenkins #2864] [Release 7.0.166] prepare for next dev…
wso2-jenkins-bot Aug 14, 2018
64fedcb
Merge pull request #5584 from tmkasun/APIM3_NEW
Rajith90 Aug 14, 2018
da67725
Merge commit '94ecd5ba47356bbdfc7cddefd07adfaff61c3fb7' into 7e4c876c…
wso2-jenkins-bot Aug 14, 2018
20c1be6
[WSO2 Release] [Jenkins #2865] [Release 7.0.167] prepare release v7.0…
wso2-jenkins-bot Aug 14, 2018
f9183af
[WSO2 Release] [Jenkins #2865] [Release 7.0.167] prepare for next dev…
wso2-jenkins-bot Aug 14, 2018
49b3c01
Added separate endpoint for self-sign up token generation
vithu30 Aug 14, 2018
949fc46
Merge remote-tracking branch 'remotes/wso2/master'
vithu30 Aug 14, 2018
49ac2c1
Refactored
vithu30 Aug 14, 2018
f3300b4
Added url separately
vithu30 Aug 15, 2018
d6d9e7c
Reefactor rest api admin to remove power mock dependency
uvindra Aug 14, 2018
28f4687
Refactored
vithu30 Aug 16, 2018
16ec41b
Fix test breaks after removing powermock
uvindra Aug 16, 2018
708c32d
Merge pull request #5597 from uvindra/master
uvindra Aug 16, 2018
d9527b5
[WSO2 Release] [Jenkins #2867] [Release 7.0.168] prepare release v7.0…
wso2-jenkins-bot Aug 16, 2018
e4242bd
[WSO2 Release] [Jenkins #2867] [Release 7.0.168] prepare for next dev…
wso2-jenkins-bot Aug 16, 2018
5b19699
Added url as configurable
vithu30 Aug 17, 2018
b015902
Reformatted code
vithu30 Aug 17, 2018
1032bc4
Removed empty space
vithu30 Aug 17, 2018
48832f9
Added comment
vithu30 Aug 17, 2018
8820979
Refactored
vithu30 Aug 17, 2018
871e730
Merge pull request #5572 from vithu30/master
npamudika Aug 18, 2018
9a12e2a
[WSO2 Release] [Jenkins #2869] [Release 7.0.169] prepare release v7.0…
wso2-jenkins-bot Aug 18, 2018
c18f71b
[WSO2 Release] [Jenkins #2869] [Release 7.0.169] prepare for next dev…
wso2-jenkins-bot Aug 18, 2018
bce33a2
Introduce new Publisher page structure
tmkasun Aug 20, 2018
d31b5af
Fix check styles and eslint rule issues
tmkasun Aug 20, 2018
1686c28
Improve api landing page
tmkasun Aug 21, 2018
5fec5c0
Add API list view
tmkasun Aug 22, 2018
28450d6
Add API card flex box
tmkasun Aug 23, 2018
7e510fe
Fix eslint issues
tmkasun Aug 23, 2018
8bea006
Update build command
tmkasun Aug 23, 2018
aae6e86
Merge pull request #5607 from tmkasun/APIM3_NEW
tmkasun Aug 23, 2018
62f1a3f
[WSO2 Release] [Jenkins #2871] [Release 7.0.170] prepare release v7.0…
wso2-jenkins-bot Aug 23, 2018
17fca25
[WSO2 Release] [Jenkins #2871] [Release 7.0.170] prepare for next dev…
wso2-jenkins-bot Aug 23, 2018
70fd07f
Updating MUI version and fixing breaking changes
chanaka3d Aug 25, 2018
2bcf72d
Merge pull request #5613 from chanaka3d/newMaster
chanaka3d Aug 25, 2018
a208fc5
[WSO2 Release] [Jenkins #2873] [Release 7.0.171] prepare release v7.0…
wso2-jenkins-bot Aug 25, 2018
9875898
[WSO2 Release] [Jenkins #2873] [Release 7.0.171] prepare for next dev…
wso2-jenkins-bot Aug 25, 2018
49e2ab6
Re design publisher endpoint page
Rajith90 Aug 24, 2018
dc3d0f1
Add API table view (initial)
tmkasun Aug 25, 2018
20df8b2
Remove backuped apithumb file
tmkasun Aug 25, 2018
4f322df
add capability to select multiple APIs and delete in table view
tmkasun Aug 27, 2018
7eb4a65
Merge pull request #5612 from tmkasun/APIM3_NEW
tmkasun Aug 27, 2018
f990b7d
[WSO2 Release] [Jenkins #2875] [Release 7.0.172] prepare release v7.0…
wso2-jenkins-bot Aug 27, 2018
90a3f33
[WSO2 Release] [Jenkins #2875] [Release 7.0.172] prepare for next dev…
wso2-jenkins-bot Aug 27, 2018
d78284d
Merge pull request #5611 from Rajith90/new_c5_master
Rajith90 Aug 28, 2018
9f46706
[WSO2 Release] [Jenkins #2877] [Release 7.0.173] prepare release v7.0…
wso2-jenkins-bot Aug 28, 2018
74665f5
[WSO2 Release] [Jenkins #2877] [Release 7.0.173] prepare for next dev…
wso2-jenkins-bot Aug 28, 2018
57fa4b5
Add new locale keys
tmkasun Aug 28, 2018
0063aee
Add API global search capability
tmkasun Aug 28, 2018
3b641bf
Remove power mockito and junit dependency
uvindra Aug 29, 2018
e4877ab
Merge pull request #5624 from uvindra/master
uvindra Aug 29, 2018
46f57a5
Remove power mock and junit dependency
uvindra Aug 29, 2018
e64f8af
Fixed the swagger ui issues
pubudu538 Aug 14, 2018
812a252
Adding basepath and schemes to the Swagger
pubudu538 Aug 20, 2018
8144647
Adding APIConsole app selection
pubudu538 Aug 26, 2018
f005440
Adding app dropdown for APIConsole
pubudu538 Aug 27, 2018
b04cf91
Adding gateway selection and credential selection
pubudu538 Aug 29, 2018
91aea9d
[WSO2 Release] [Jenkins #2879] [Release 7.0.174] prepare release v7.0…
wso2-jenkins-bot Aug 29, 2018
76d1ff3
[WSO2 Release] [Jenkins #2879] [Release 7.0.174] prepare for next dev…
wso2-jenkins-bot Aug 29, 2018
3119755
Merge pull request #5627 from pubudu538/master
pubudu538 Aug 29, 2018
3ae379f
[WSO2 Release] [Jenkins #2881] [Release 7.0.175] prepare release v7.0…
wso2-jenkins-bot Aug 29, 2018
8c09de3
[WSO2 Release] [Jenkins #2881] [Release 7.0.175] prepare for next dev…
wso2-jenkins-bot Aug 29, 2018
2abaed5
Adding i18n support for Store app
pubudu538 Aug 29, 2018
9b726b3
Merge pull request #5630 from pubudu538/master
tmkasun Aug 29, 2018
350349d
[WSO2 Release] [Jenkins #2883] [Release 7.0.176] prepare release v7.0…
wso2-jenkins-bot Aug 29, 2018
9f6b69d
[WSO2 Release] [Jenkins #2883] [Release 7.0.176] prepare for next dev…
wso2-jenkins-bot Aug 29, 2018
0f4a117
Applying new theme to the store
chanaka3d Sep 5, 2018
9641eaa
Merging the missing changes from Pubudu
chanaka3d Sep 5, 2018
c9228d3
Addding missing progress.jsx from Pubudu
chanaka3d Sep 5, 2018
94da6b1
Fixing the import of API Console
chanaka3d Sep 5, 2018
146b03c
Adding missing dependency
chanaka3d Sep 5, 2018
9e604c7
Adding missing dependency
chanaka3d Sep 5, 2018
d02ae75
Merge pull request #5618 from tmkasun/APIM3_NEW
tmkasun Sep 5, 2018
06c08fb
Add endpoint editing capability
Rajith90 Aug 29, 2018
3d318a1
API Endpoint page fail over and load balance endpoint adding
Rajith90 Sep 5, 2018
279c7bb
Merge pull request #5622 from Rajith90/new_c5_master
Rajith90 Sep 5, 2018
d0a9a5f
[WSO2 Release] [Jenkins #2885] [Release 7.0.177] prepare release v7.0…
wso2-jenkins-bot Sep 5, 2018
5875852
[WSO2 Release] [Jenkins #2885] [Release 7.0.177] prepare for next dev…
wso2-jenkins-bot Sep 5, 2018
0fb45cf
Merge commit '5875852eb288c014ae643244c3298b96ec5e1c1b' into 08cdd136…
wso2-jenkins-bot Sep 5, 2018
d5b7873
Merge pull request #5656 from chanaka3d/myMaster
chanaka3d Sep 5, 2018
965820c
[WSO2 Release] [Jenkins #2886] [Release 7.0.178] prepare release v7.0…
wso2-jenkins-bot Sep 5, 2018
8d11897
[WSO2 Release] [Jenkins #2886] [Release 7.0.178] prepare for next dev…
wso2-jenkins-bot Sep 5, 2018
63c74ff
Merge commit '8d11897fe70566b94d510bf94cdf5605397df9fc' into c8b8ca5c…
wso2-jenkins-bot Sep 5, 2018
627c6c6
[WSO2 Release] [Jenkins #2887] [Release 7.0.179] prepare release v7.0…
wso2-jenkins-bot Sep 5, 2018
825e597
[WSO2 Release] [Jenkins #2887] [Release 7.0.179] prepare for next dev…
wso2-jenkins-bot Sep 5, 2018
f0e4a54
Removing unused files and imports
chanaka3d Sep 6, 2018
90bad5f
Merge pull request #5663 from chanaka3d/myMaster
chanaka3d Sep 6, 2018
3850697
[WSO2 Release] [Jenkins #2889] [Release 7.0.180] prepare release v7.0…
wso2-jenkins-bot Sep 6, 2018
11b2af3
[WSO2 Release] [Jenkins #2889] [Release 7.0.180] prepare for next dev…
wso2-jenkins-bot Sep 6, 2018
3780ef6
Re-structure api detail pages
tmkasun Sep 5, 2018
90fe0d1
Improve API Details page
tmkasun Sep 6, 2018
e41149a
Fix eslint issues
tmkasun Sep 6, 2018
0812ce5
Merge pull request #5666 from tmkasun/APIM3_NEW
Rajith90 Sep 6, 2018
c79d1cc
[WSO2 Release] [Jenkins #2891] [Release 7.0.181] prepare release v7.0…
wso2-jenkins-bot Sep 6, 2018
2821931
[WSO2 Release] [Jenkins #2891] [Release 7.0.181] prepare for next dev…
wso2-jenkins-bot Sep 6, 2018
9208f79
Update routes and sample API
tmkasun Sep 6, 2018
601aeff
Fix null issue
tmkasun Sep 6, 2018
fa2ca2a
Fix type case issue
tmkasun Sep 6, 2018
440c78a
Merge pull request #5668 from tmkasun/APIM3_NEW
Rajith90 Sep 6, 2018
fc1c0a3
[WSO2 Release] [Jenkins #2893] [Release 7.0.182] prepare release v7.0…
wso2-jenkins-bot Sep 6, 2018
73f8b54
[WSO2 Release] [Jenkins #2893] [Release 7.0.182] prepare for next dev…
wso2-jenkins-bot Sep 6, 2018
51e0641
Fix create API route issues
tmkasun Sep 7, 2018
ffb9c8e
Adding missing locale en json file
pubudu538 Sep 7, 2018
1d6e1e6
Merge pull request #5679 from pubudu538/locale
Rajith90 Sep 7, 2018
90d1a5e
[WSO2 Release] [Jenkins #2895] [Release 7.0.183] prepare release v7.0…
wso2-jenkins-bot Sep 7, 2018
dc3fa80
[WSO2 Release] [Jenkins #2895] [Release 7.0.183] prepare for next dev…
wso2-jenkins-bot Sep 7, 2018
66da45f
API Create improvments
tmkasun Sep 7, 2018
708b86b
Merge pull request #5673 from tmkasun/APIM3_NEW
tmkasun Sep 7, 2018
9cb710a
Fix eslint issues
tmkasun Sep 7, 2018
6130136
Merge pull request #5681 from tmkasun/APIM3_NEW
Rajith90 Sep 7, 2018
2b09bf6
[WSO2 Release] [Jenkins #2898] [Release 7.0.184] prepare release v7.0…
wso2-jenkins-bot Sep 7, 2018
351c8b4
[WSO2 Release] [Jenkins #2898] [Release 7.0.184] prepare for next dev…
wso2-jenkins-bot Sep 7, 2018
8d22700
Add alias to webpack resolve, unified api create pages according to
tmkasun Sep 10, 2018
3cce6bf
Merge pull request #5689 from tmkasun/APIM3_NEW
Rajith90 Sep 10, 2018
f158106
[WSO2 Release] [Jenkins #2900] [Release 7.0.185] prepare release v7.0…
wso2-jenkins-bot Sep 10, 2018
45ea90c
[WSO2 Release] [Jenkins #2900] [Release 7.0.185] prepare for next dev…
wso2-jenkins-bot Sep 10, 2018
9eedaa4
fix styling and eslint issues, add new linting paths
tmkasun Sep 11, 2018
6c05c1a
add missing button type prop
tmkasun Sep 11, 2018
83de7ca
Merge pull request #5693 from tmkasun/APIM3_NEW
tmkasun Sep 11, 2018
265fe46
[WSO2 Release] [Jenkins #2902] [Release 7.0.186] prepare release v7.0…
wso2-jenkins-bot Sep 11, 2018
9673b41
[WSO2 Release] [Jenkins #2902] [Release 7.0.186] prepare for next dev…
wso2-jenkins-bot Sep 11, 2018
d7eb6d1
Update pull request template
praminda Sep 11, 2018
7bd2def
Merge pull request #5625 from uvindra/master
uvindra Sep 11, 2018
eeacdeb
[WSO2 Release] [Jenkins #2904] [Release 7.0.187] prepare release v7.0…
wso2-jenkins-bot Sep 11, 2018
48e2c21
[WSO2 Release] [Jenkins #2904] [Release 7.0.187] prepare for next dev…
wso2-jenkins-bot Sep 11, 2018
325a767
Remove old PR template
praminda Sep 11, 2018
ac739bc
Merge pull request #5695 from praminda/pr-template
pubudu538 Sep 11, 2018
a22d325
Merge commit '48e2c2108864228705053342e46c781bbed09ba8' into 433a218e…
wso2-jenkins-bot Sep 11, 2018
b27dfd7
[WSO2 Release] [Jenkins #2905] [Release 7.0.188] prepare release v7.0…
wso2-jenkins-bot Sep 11, 2018
65325f8
[WSO2 Release] [Jenkins #2905] [Release 7.0.188] prepare for next dev…
wso2-jenkins-bot Sep 11, 2018
c97b1aa
Adding store and gateway labels instead of labels
pubudu538 Sep 6, 2018
2f71ab5
Changing rest apis to support gateway and store labels
pubudu538 Sep 7, 2018
9784110
Fixing test failures for gateway and store labels
pubudu538 Sep 10, 2018
b2d6faf
Updated labels in store apis search
pubudu538 Sep 11, 2018
3554157
Publisher endpoint page improvements
Rajith90 Sep 12, 2018
6ef9b36
Merge pull request #5705 from Rajith90/new_c5_master
Rajith90 Sep 13, 2018
c41343f
[WSO2 Release] [Jenkins #2907] [Release 7.0.189] prepare release v7.0…
wso2-jenkins-bot Sep 13, 2018
21015f3
[WSO2 Release] [Jenkins #2907] [Release 7.0.189] prepare for next dev…
wso2-jenkins-bot Sep 13, 2018
4f2ac4d
Merge pull request #5715 from pubudu538/master
pubudu538 Sep 13, 2018
c66d57a
Merge commit '21015f336fd0f3d1194f7f9413d95a32d3eea98b' into de6d2940…
wso2-jenkins-bot Sep 13, 2018
44a8e4d
[WSO2 Release] [Jenkins #2908] [Release 7.0.190] prepare release v7.0…
wso2-jenkins-bot Sep 13, 2018
f590f17
[WSO2 Release] [Jenkins #2908] [Release 7.0.190] prepare for next dev…
wso2-jenkins-bot Sep 13, 2018
768d84a
Fix global endpoint MUI migration issues
tmkasun Sep 13, 2018
d2a3174
refactor global endpoints page
tmkasun Sep 13, 2018
5ae6bb5
Change build output to fix travis log limit exceed issue, update stor…
tmkasun Sep 13, 2018
8fb0f83
Merge pull request #5720 from tmkasun/APIM3_NEW
tmkasun Sep 13, 2018
639ab05
[WSO2 Release] [Jenkins #2910] [Release 7.0.191] prepare release v7.0…
wso2-jenkins-bot Sep 13, 2018
68f021f
[WSO2 Release] [Jenkins #2910] [Release 7.0.191] prepare for next dev…
wso2-jenkins-bot Sep 13, 2018
f564f7f
Add Authentication Interceptor for Oauth Rest APIS
tharindu1st Sep 18, 2018
14329a9
Upgrade carbon.auth.version
tharindu1st Sep 18, 2018
a5760f4
Merge pull request #5734 from tharindu1st/integration-test
tharindu1st Sep 18, 2018
6a75b0b
[WSO2 Release] [Jenkins #2914] [Release 7.0.192] prepare release v7.0…
wso2-jenkins-bot Sep 18, 2018
1407bc5
[WSO2 Release] [Jenkins #2914] [Release 7.0.192] prepare for next dev…
wso2-jenkins-bot Sep 18, 2018
d0c3309
Fixing config provider becomes null
pubudu538 Sep 19, 2018
76ec27f
Support Extended API details when listing apis via publisher rest API
Rajith90 Sep 19, 2018
d7be390
Merge pull request #5736 from pubudu538/master
pubudu538 Sep 19, 2018
9602620
[WSO2 Release] [Jenkins #2916] [Release 7.0.193] prepare release v7.0…
wso2-jenkins-bot Sep 19, 2018
c4eaec7
[WSO2 Release] [Jenkins #2916] [Release 7.0.193] prepare for next dev…
wso2-jenkins-bot Sep 19, 2018
dcfa979
Merge pull request #5737 from Rajith90/new_c5_master
Rajith90 Sep 19, 2018
aa3fea8
[WSO2 Release] [Jenkins #2918] [Release 7.0.194] prepare release v7.0…
wso2-jenkins-bot Sep 19, 2018
ab8204d
[WSO2 Release] [Jenkins #2918] [Release 7.0.194] prepare for next dev…
wso2-jenkins-bot Sep 19, 2018
8d20ff1
Changing the subscription flow according to new UX
chanaka3d Sep 20, 2018
dbe2d65
add chunking by components, add alias to relative imports, change log…
tmkasun Sep 20, 2018
6542033
Fix Username shown in APIS
tharindu1st Sep 20, 2018
f3aa3e6
Merge pull request #5741 from tharindu1st/integration-test
tharindu1st Sep 20, 2018
48aae56
Merge pull request #5739 from chanaka3d/myMaster
chanaka3d Sep 20, 2018
8b78593
Merge pull request #5740 from tmkasun/APIM3_NEW
tharindu1st Sep 20, 2018
542a174
Added missing theme file to the store webapp
chanaka3d Sep 20, 2018
4e818fd
Fixing Build Failure
tharindu1st Sep 20, 2018
9141ca1
Merge pull request #5742 from chanaka3d/myMaster
chanaka3d Sep 20, 2018
7a9d4be
Merge pull request #5743 from tharindu1st/integration-test
tharindu1st Sep 20, 2018
f51e5f4
[WSO2 Release] [Jenkins #2923] [Release 7.0.195] prepare release v7.0…
wso2-jenkins-bot Sep 20, 2018
c1c8145
[WSO2 Release] [Jenkins #2923] [Release 7.0.195] prepare for next dev…
wso2-jenkins-bot Sep 20, 2018
8a9314d
Create API UI improvements
Sep 21, 2018
9b94518
Merge remote-tracking branch 'origin/master'
Sep 21, 2018
861dabd
Fix Travis build failue + refresh_token not retrieved into ui issue
tharindu1st Sep 21, 2018
567bc15
Merge pull request #5746 from tharindu1st/integration-test
tharindu1st Sep 21, 2018
00aeef8
[WSO2 Release] [Jenkins #2925] [Release 7.0.196] prepare release v7.0…
wso2-jenkins-bot Sep 21, 2018
6b8db14
[WSO2 Release] [Jenkins #2925] [Release 7.0.196] prepare for next dev…
wso2-jenkins-bot Sep 21, 2018
3d21fa6
Fix logout feature
tmkasun Sep 21, 2018
f5120a2
Fixing some of the layout issues
chanaka3d Sep 24, 2018
0c1864c
Fixing collapse issues and adding new application pages
chanaka3d Sep 25, 2018
caca294
Fixing the basic functinallity of the Resources page
chanaka3d Sep 25, 2018
0f2f04f
Merge pull request #5750 from chanaka3d/myMaster
chanaka3d Sep 25, 2018
663d2d7
[WSO2 Release] [Jenkins #2927] [Release 7.0.197] prepare release v7.0…
wso2-jenkins-bot Sep 25, 2018
cb1a6c4
[WSO2 Release] [Jenkins #2927] [Release 7.0.197] prepare for next dev…
wso2-jenkins-bot Sep 25, 2018
0fa1816
fix formatting
Sep 25, 2018
98d8187
Merge pull request #5745 from isharac/master
isharac Sep 25, 2018
8a71ee5
[WSO2 Release] [Jenkins #2929] [Release 7.0.198] prepare release v7.0…
wso2-jenkins-bot Sep 25, 2018
b09362f
[WSO2 Release] [Jenkins #2929] [Release 7.0.198] prepare for next dev…
wso2-jenkins-bot Sep 25, 2018
f36717d
Publisher - search apis based on gateway label
Rajith90 Sep 25, 2018
b70060b
Update SecondarySearchType.java
Rajith90 Sep 25, 2018
cdbdb56
Merge pull request #5749 from tmkasun/APIM3_NEW
tmkasun Sep 26, 2018
23c2734
[WSO2 Release] [Jenkins #2931] [Release 7.0.199] prepare release v7.0…
wso2-jenkins-bot Sep 26, 2018
5adefad
[WSO2 Release] [Jenkins #2931] [Release 7.0.199] prepare for next dev…
wso2-jenkins-bot Sep 26, 2018
9029cd0
Support Store label search
Rajith90 Sep 26, 2018
afd8ae0
Merge pull request #5753 from Rajith90/new_c5_master
Rajith90 Sep 26, 2018
9b78645
[WSO2 Release] [Jenkins #2933] [Release 7.0.200] prepare release v7.0…
wso2-jenkins-bot Sep 26, 2018
867c113
[WSO2 Release] [Jenkins #2933] [Release 7.0.200] prepare for next dev…
wso2-jenkins-bot Sep 26, 2018
fc4d905
Created API scopes landing page in publisher.
prasa7 Sep 27, 2018
c634d15
Fixed PR comments.
prasa7 Sep 27, 2018
6bfcf19
Fixed PR comments.
prasa7 Sep 27, 2018
32bd127
Formated defaultMessage to be under the line charachtor count.
prasa7 Sep 27, 2018
b8dc098
Bump testng from 6.9.10 to 7.4.0
dependabot-preview[bot] Mar 1, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
29 changes: 25 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,15 @@ target
.classpath
.settings
.project
*.i??
*.iml
*.iws
*.ipr
*.swagger-codegen-ignore
*~
.idea
features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/repository/database/WSO2AM_DB.h2.db
*.DS_Store
*osgi-imports
features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/repository/database/WSO2AM_DB.h2.db
features/apimgt/org.wso2.carbon.apimgt.gateway.feature/src/main/resources/am#sample#calculator#*.war
features/apimgt/org.wso2.carbon.apimgt.gateway.feature/src/main/resources/am#sample#pizzashack#*.war
features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/src/main/resources/client-registration#*.war
Expand All @@ -18,5 +23,21 @@ features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/src/main/resou
features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/src/main/resources/api-docs/package.json
features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/src/main/resources/api-docs/main.js
features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/src/main/resources/api-docs/package.json
features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/src/main/resources/api-docs/main.js
features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/src/main/resources/api-docs/package.json
features/org.wso2.carbon.apimgt.lifecycle.manager.feature/resources/database/
features/apimgt/org.wso2.carbon.apimgt.core.feature/resources/database/
lcm/features/org.wso2.carbon.apimgt.lifecycle.manager.feature/resources/database/WSO2LIFECYCLE_DB.h2.db
components/apimgt/org.wso2.carbon.apimgt.rest.api.commons/src/main/resources/publisher-api.yaml
components/apimgt/org.wso2.carbon.apimgt.rest.api.commons/src/main/resources/store-api.yaml
components/apimgt/org.wso2.carbon.apimgt.rest.api.commons/src/main/resources/analytics-api.yaml
components/apimgt/org.wso2.carbon.apimgt.rest.api.commons/src/main/resources/admin-api.yaml
components/apimgt/org.wso2.carbon.apimgt.core/src/test/resources/amdb/
#################
## NPM
#################
node_modules/
dist
npm-debug.log
#################
### VS_CODE
##################
.vscode
20 changes: 20 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
# Use Ubuntu Trusty with sudo instead of new default Trusty because of higher resources availability
sudo: required
dist: trusty
language: java

install:
- . $HOME/.nvm/nvm.sh
- nvm install 8.9.0
- nvm use 8.9.0

# Using -q Quiet output which only show errors, to overcome TravisCI log limit issue
script: travis_wait 100 mvn clean install -q -B -V

cache:
directories:
- $HOME/.m2
- features/apimgt/org.wso2.carbon.apimgt.admin.feature/src/main/resources/admin/node_modules
- features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/node_modules
- features/apimgt/org.wso2.carbon.apimgt.store.feature/src/main/resources/store/node_modules
67 changes: 61 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,64 @@
# carbon-apimgt
# About this repository

##Jenkins Build Status
| Branch | Build Status(Jenkins) | Build Status(TravisCI) |
| :------------ |:------------- |:-------------
| master | [![Build Status](https://wso2.org/jenkins/job/platform-builds/job/carbon-apimgt/badge/icon)](https://wso2.org/jenkins/job/platform-builds/job/carbon-apimgt/) | [![Build Status](https://api.travis-ci.org/wso2/carbon-apimgt.svg?branch=master)](https://travis-ci.org/wso2/carbon-apimgt) |

| Branch | Build Status |
| :------------ |:-------------
| Java 7 | [![Build Status](https://wso2.org/jenkins/job/carbon-apimgt/badge/icon)](https://wso2.org/jenkins/job/carbon-apimgt/)
| Java 8 | [![Build Status](https://wso2.org/jenkins/job/carbon-apimgt__java8/badge/icon)](https://wso2.org/jenkins/job/carbon-apimgt__java8/)
This repository contains major components which are used to build the API Manager product.

## Building from the source

If you want to build carbon-apimgt from the source code:

1. Install Java 8 (http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html)
1. Install Apache Maven 3.x.x (https://maven.apache.org/download.cgi#)
1. Get a clone or download the source from this repository (https://github.com/wso2/carbon-apimgt.git).
1. Run the Maven command ``mvn clean install`` from the ``carbon-apimgt`` directory.


## Running Integration tests in docker containers(Optional)


1. Install docker
1. Go inside to the carbon-apimgt directory
1. Run integration test by giving following commands

* mvn clean install -P local-h2
* mvn clean install -P local-mysql
* mvn clean install -P local-postgres
* mvn clean install -P local-mssql
* mvn clean install -P local-oracle

## Start integration tests in debug mode

### For docker based tests:

* mvn -P local-mysql -Dmaven.failsafe.debug verify
Note: local-mysql is the profile. Use other profiles accordingly.

### For unit tests:

* mvn -Dmaven.surefire.debug="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -Xnoagent -Djava.compiler=NONE" test

## How to create a new REST API in C5:

1. Build following repositories.

* https://github.com/swagger-api/swagger-codegen
* https://github.com/sanjeewa-malalgoda/swagger2MSF4J

2. If you going to add or modify the publisher REST API then add your API definition changes into the publisher-api.yaml
Likewise, if you are going to add or modify the store REST API then add your API definition changes into the store-api.yaml


3 Build the org.wso2.carbon.apimgt.rest.api.publisher or org.wso2.carbon.apimgt.rest.api.store REST API components with following command.
* mvn swagger2msf4j:generate

NOTE: This command will erase some existing classes. Please filter relevant changes which regard to your modification.


4. Increase the service count by number of APIs that you create(This requires only if you add new API).
<carbon.component>
osgi.service; objectClass="org.wso2.msf4j.Microservice"; serviceCount="5"
</carbon.component>

201 changes: 201 additions & 0 deletions analyzer-modules/etc/feature.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
################################################################################
# Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
#
# WSO2 Inc. licenses this file to you under the Apache License,
# Version 2.0 (the "License"); you may not use this file except
# in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#
################################################################################

providerName=WSO2 Inc.

########################## license properties ##################################
licenseURL=http://www.apache.org/licenses/LICENSE-2.0

license=\
Apache License\n\
Version 2.0, January 2004\n\
http://www.apache.org/licenses/\n\
\n\
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\
\n\
1. Definitions.\n\
\n\
"License" shall mean the terms and conditions for use, reproduction,\n\
and distribution as defined by Sections 1 through 9 of this document.\n\
\n\
"Licensor" shall mean the copyright owner or entity authorized by\n\
the copyright owner that is granting the License.\n\
\n\
"Legal Entity" shall mean the union of the acting entity and all\n\
other entities that control, are controlled by, or are under common\n\
control with that entity. For the purposes of this definition,\n\
"control" means (i) the power, direct or indirect, to cause the\n\
direction or management of such entity, whether by contract or\n\
otherwise, or (ii) ownership of fifty percent (50%) or more of the\n\
outstanding shares, or (iii) beneficial ownership of such entity.\n\
\n\
"You" (or "Your") shall mean an individual or Legal Entity\n\
exercising permissions granted by this License.\n\
\n\
"Source" form shall mean the preferred form for making modifications,\n\
including but not limited to software source code, documentation\n\
source, and configuration files.\n\
\n\
"Object" form shall mean any form resulting from mechanical\n\
transformation or translation of a Source form, including but\n\
not limited to compiled object code, generated documentation,\n\
and conversions to other media types.\n\
\n\
"Work" shall mean the work of authorship, whether in Source or\n\
Object form, made available under the License, as indicated by a\n\
copyright notice that is included in or attached to the work\n\
(an example is provided in the Appendix below).\n\
\n\
"Derivative Works" shall mean any work, whether in Source or Object\n\
form, that is based on (or derived from) the Work and for which the\n\
editorial revisions, annotations, elaborations, or other modifications\n\
represent, as a whole, an original work of authorship. For the purposes\n\
of this License, Derivative Works shall not include works that remain\n\
separable from, or merely link (or bind by name) to the interfaces of,\n\
the Work and Derivative Works thereof.\n\
\n\
"Contribution" shall mean any work of authorship, including\n\
the original version of the Work and any modifications or additions\n\
to that Work or Derivative Works thereof, that is intentionally\n\
submitted to Licensor for inclusion in the Work by the copyright owner\n\
or by an individual or Legal Entity authorized to submit on behalf of\n\
the copyright owner. For the purposes of this definition, "submitted"\n\
means any form of electronic, verbal, or written communication sent\n\
to the Licensor or its representatives, including but not limited to\n\
communication on electronic mailing lists, source code control systems,\n\
and issue tracking systems that are managed by, or on behalf of, the\n\
Licensor for the purpose of discussing and improving the Work, but\n\
excluding communication that is conspicuously marked or otherwise\n\
designated in writing by the copyright owner as "Not a Contribution."\n\
\n\
"Contributor" shall mean Licensor and any individual or Legal Entity\n\
on behalf of whom a Contribution has been received by Licensor and\n\
subsequently incorporated within the Work.\n\
\n\
2. Grant of Copyright License. Subject to the terms and conditions of\n\
this License, each Contributor hereby grants to You a perpetual,\n\
worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
copyright license to reproduce, prepare Derivative Works of,\n\
publicly display, publicly perform, sublicense, and distribute the\n\
Work and such Derivative Works in Source or Object form.\n\
\n\
3. Grant of Patent License. Subject to the terms and conditions of\n\
this License, each Contributor hereby grants to You a perpetual,\n\
worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
(except as stated in this section) patent license to make, have made,\n\
use, offer to sell, sell, import, and otherwise transfer the Work,\n\
where such license applies only to those patent claims licensable\n\
by such Contributor that are necessarily infringed by their\n\
Contribution(s) alone or by combination of their Contribution(s)\n\
with the Work to which such Contribution(s) was submitted. If You\n\
institute patent litigation against any entity (including a\n\
cross-claim or counterclaim in a lawsuit) alleging that the Work\n\
or a Contribution incorporated within the Work constitutes direct\n\
or contributory patent infringement, then any patent licenses\n\
granted to You under this License for that Work shall terminate\n\
as of the date such litigation is filed.\n\
\n\
4. Redistribution. You may reproduce and distribute copies of the\n\
Work or Derivative Works thereof in any medium, with or without\n\
modifications, and in Source or Object form, provided that You\n\
meet the following conditions:\n\
\n\
(a) You must give any other recipients of the Work or\n\
Derivative Works a copy of this License; and\n\
\n\
(b) You must cause any modified files to carry prominent notices\n\
stating that You changed the files; and\n\
\n\
(c) You must retain, in the Source form of any Derivative Works\n\
that You distribute, all copyright, patent, trademark, and\n\
attribution notices from the Source form of the Work,\n\
excluding those notices that do not pertain to any part of\n\
the Derivative Works; and\n\
\n\
(d) If the Work includes a "NOTICE" text file as part of its\n\
distribution, then any Derivative Works that You distribute must\n\
include a readable copy of the attribution notices contained\n\
within such NOTICE file, excluding those notices that do not\n\
pertain to any part of the Derivative Works, in at least one\n\
of the following places: within a NOTICE text file distributed\n\
as part of the Derivative Works; within the Source form or\n\
documentation, if provided along with the Derivative Works; or,\n\
within a display generated by the Derivative Works, if and\n\
wherever such third-party notices normally appear. The contents\n\
of the NOTICE file are for informational purposes only and\n\
do not modify the License. You may add Your own attribution\n\
notices within Derivative Works that You distribute, alongside\n\
or as an addendum to the NOTICE text from the Work, provided\n\
that such additional attribution notices cannot be construed\n\
as modifying the License.\n\
\n\
You may add Your own copyright statement to Your modifications and\n\
may provide additional or different license terms and conditions\n\
for use, reproduction, or distribution of Your modifications, or\n\
for any such Derivative Works as a whole, provided Your use,\n\
reproduction, and distribution of the Work otherwise complies with\n\
the conditions stated in this License.\n\
\n\
5. Submission of Contributions. Unless You explicitly state otherwise,\n\
any Contribution intentionally submitted for inclusion in the Work\n\
by You to the Licensor shall be under the terms and conditions of\n\
this License, without any additional terms or conditions.\n\
Notwithstanding the above, nothing herein shall supersede or modify\n\
the terms of any separate license agreement you may have executed\n\
with Licensor regarding such Contributions.\n\
\n\
6. Trademarks. This License does not grant permission to use the trade\n\
names, trademarks, service marks, or product names of the Licensor,\n\
except as required for reasonable and customary use in describing the\n\
origin of the Work and reproducing the content of the NOTICE file.\n\
\n\
7. Disclaimer of Warranty. Unless required by applicable law or\n\
agreed to in writing, Licensor provides the Work (and each\n\
Contributor provides its Contributions) on an "AS IS" BASIS,\n\
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n\
implied, including, without limitation, any warranties or conditions\n\
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n\
PARTICULAR PURPOSE. You are solely responsible for determining the\n\
appropriateness of using or redistributing the Work and assume any\n\
risks associated with Your exercise of permissions under this License.\n\
\n\
8. Limitation of Liability. In no event and under no legal theory,\n\
whether in tort (including negligence), contract, or otherwise,\n\
unless required by applicable law (such as deliberate and grossly\n\
negligent acts) or agreed to in writing, shall any Contributor be\n\
liable to You for damages, including any direct, indirect, special,\n\
incidental, or consequential damages of any character arising as a\n\
result of this License or out of the use or inability to use the\n\
Work (including but not limited to damages for loss of goodwill,\n\
work stoppage, computer failure or malfunction, or any and all\n\
other commercial damages or losses), even if such Contributor\n\
has been advised of the possibility of such damages.\n\
\n\
9. Accepting Warranty or Additional Liability. While redistributing\n\
the Work or Derivative Works thereof, You may choose to offer,\n\
and charge a fee for, acceptance of support, warranty, indemnity,\n\
or other liability obligations and/or rights consistent with this\n\
License. However, in accepting such obligations, You may act only\n\
on Your own behalf and on Your sole responsibility, not on behalf\n\
of any other Contributor, and only if You agree to indemnify,\n\
defend, and hold each Contributor harmless for any liability\n\
incurred by, or claims asserted against, such Contributor by reason\n\
of your accepting any such warranty or additional liability.\n\
\n\
END OF TERMS AND CONDITIONS\n\
Loading