Compare commits

..

363 Commits

Author SHA1 Message Date
stanislav.bieliaiev
b9821c54f8 Revert "fix(APPINT-35116) - fix for nexus versions"
This reverts commit 3fb65fd3f1.
2022-10-27 11:25:03 +03:00
stanislav.bieliaiev
3fb65fd3f1 fix(APPINT-35116) - fix for nexus versions 2022-10-27 11:24:10 +03:00
stanislav.bieliaiev
c1533f273e fix(APPINT-34581) - fixed versions 2022-10-17 21:19:21 +03:00
Laurent BOURGEOIS
61f21c1658 feat(TBD-14263):Support MongoDB v4+ - Spark Batch 3.1+ - GA (#5699) 2022-10-17 11:35:19 +02:00
Liu Xinquan
fb61a6cc08 fix(TDQ-20751) tDqReportRun Snowflake Context (#5704) (#5705) 2022-10-17 17:33:42 +08:00
Svitlana Anulich
746ff4aff7 fix(TBD-14194): add knox session timeout variable (#5685) (#5702) 2022-10-17 10:57:26 +03:00
Laurent BOURGEOIS
720c10ffab feat(TBD-13810): add dynamic schema on tfileinputdelimited (#5599) (#5700)
Co-authored-by: Samuel ANTOINE <samuel.antoine.talend@gmail.com>
2022-10-17 08:56:33 +02:00
sbliu
eac4d46b9e fix(TUP-36726) add warning icon and tip message. (#5683) (#5701) 2022-10-17 14:30:36 +08:00
tsasada-talend
1e521b64c0 Add localized files (#5695)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-10-14 19:58:47 +08:00
kjwang
c85260c0b5 TUP-36732 Studio can not fetch SSO access token automatically if stay on (#5689) (#5696)
TUP-36732 Studio can not fetch SSO access token automatically if stay on logon dialog for long time
https://jira.talendforge.org/browse/TUP-36732
2022-10-13 18:05:50 +08:00
Jane Ding
7727289673 fix(TUP-36893):Add new column import_product for Import items pendo (#5690) (#5693)
event
https://jira.talendforge.org/browse/TUP-36893
2022-10-13 16:04:44 +08:00
sbieliaievl
cc56f55c46 fix(APPINT-34581) - Route and data services features versions behave differently in Talend Runtime (#5660)
* fix(APPINT-34581) - added methods for getting feature and bundle version

* fix(APPINT-34581)

* fix(APPINT-34581)

* fix(APPINT-34581)
2022-10-13 10:39:08 +03:00
Jane Ding
109199da03 fix(TUP-36284):Compile error in Studio (#5607) (#5691)
* fix(TUP-36284):Compile error in Studio
https://jira.talendforge.org/browse/TUP-36284

* fix(TUP-36284):Compile error in Studio
https://jira.talendforge.org/browse/TUP-36284
2022-10-13 11:58:15 +08:00
sbieliaievl
d21695dfae feat(APPINT-26700) - Ability to modify microservice application properties file within Talend Studio (#5594)
* fix(APPINT-34929) - added constants for settings application properties

* APPINT-26700: Ability to modify microservice application properties file within Talend Studio

Co-authored-by: arashankar <abdulhamid0606@gmail.com>
2022-10-12 12:27:26 +02:00
kjwang
f31f58c945 Fix TUP-36747 Improve logs when Log in with Talend Cloud (#5679) (#5688)
Fix TUP-36747 Improve logs when Log in with Talend Cloud
https://jira.talendforge.org/browse/TUP-36747
2022-10-12 17:00:34 +08:00
Emmanuel GALLOIS
54fbf241cd feat(TDI-48595): bump component-runtime to 1.49 (#5648) 2022-10-12 10:20:56 +02:00
kjwang
b4859e59d1 TUP-36812 If user installed JAVA version less than 11, Web browser can't (#5673) (#5687)
* TUP-36812 If user installed JAVA version less than 11, Web browser can't
call back SSO client.
https://jira.talendforge.org/browse/TUP-36812
2022-10-12 15:52:33 +08:00
Jane Ding
f9348709de fix(TUP-36780):Add tracking to Studio (#5655) (#5681)
https://jira.talendforge.org/browse/TUP-36780
2022-10-12 11:11:37 +08:00
Jane Ding
bc88a7f4d8 fix(TUP-36710):Some tMap data not show in pendo (#5636) (#5680)
https://jira.talendforge.org/browse/TUP-36710
2022-10-12 11:11:26 +08:00
Zhiwei Xue
a86c54fc71 feat(TUP-36415):Add needed --add-opens parameters for job execution (#5654) 2022-10-12 10:00:09 +08:00
tsasada-talend
bd6673d7e6 Add localized files (#5665)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-10-09 09:21:07 +08:00
Alexiane Yvonet
e044933297 Add localized files (#5662)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-10-09 09:19:05 +08:00
Jane Ding
54446d79dc fix(TUP-36169) Performance issue when execute "Generate Doc as html" (#5666) 2022-10-06 18:34:25 +08:00
dicarcab
a7bafcabd3 fix(TBD-10400): Reject flow doesn't work correctly for dates in extract components (#5658) 2022-09-30 09:34:30 +02:00
Alexiane Yvonet
c5656cb59d Add localized files (#5656)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-09-30 14:55:23 +08:00
tsasada-talend
fcd01e14c0 Add localized files (#5653)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-09-30 14:55:01 +08:00
sbliu
6fae597691 fix(TUP-36169) Performance issue when execute "Generate Doc as html" (#5580) 2022-09-30 14:38:51 +08:00
kjwang
1fc638f09b kjwang/Fix TUP-32606 Support SSO on Studio (Fix build error) (#5651)
kjwang/Fix TUP-32606 Support SSO on Studio (Fix build error)
2022-09-28 10:33:57 +08:00
kjwang
3a0b1d48cb TUP-36748 Studio send request to wrong data center when token invalid (#5633) (#5645)
* TUP-36748 Studio send request to wrong data center when token invalid
https://jira.talendforge.org/browse/TUP-36748
2022-09-26 18:22:08 +08:00
kjwang
6ef54dc38e Fix TUP-36740 When open tmc login page, we should encode all the (#5631) (#5642)
Fix TUP-36740 When open tmc login page, we should encode all the parameters in URL
https://jira.talendforge.org/browse/TUP-36740
2022-09-26 17:53:56 +08:00
kjwang
ce2c8478a0 kjwang/Fix TUP-36721 Only display SSO page for Talend Studio (#5611) (#5620) (#5641)
kjwang/Fix TUP-36721 Only display SSO page for Talend Studio
https://jira.talendforge.org/browse/TUP-36721
2022-09-26 17:51:58 +08:00
kjwang
93d76e62bd Fix TUP-36723 can not list project when use old way to fetch from token (#5613) (#5621) (#5640)
Fix TUP-36723 can not list project when use old way to fetch from token
https://jira.talendforge.org/browse/TUP-36723
2022-09-26 15:13:44 +08:00
kjwang
4b36a57b07 Fix TUP-36733 Fix junit error on maintenance/8.0 (#5628) (#5639)
Fix TUP-36733 Fix junit error on maintenance/8.0
https://jira.talendforge.org/browse/TUP-36733
2022-09-26 10:58:16 +08:00
kjwang
0784f2db5f Fix: TUP-36714 Improve the code for SSO feature (#5608) (#5612) (#5638)
* Fix: TUP-36714 Improve the code for SSO feature
https://jira.talendforge.org/browse/TUP-36714
2022-09-26 10:44:44 +08:00
kjwang
1bc2417f2d kjwang/feat_TUP-32606_Support_SSO (Fix version issue) (#5637)
* kjwang/feat_TUP-32606_Support_SSO (Fix version issue)
2022-09-26 10:16:23 +08:00
kjwang
e1e57b4629 TUP-32606 Support SSO on Studio (#5635)
TUP-32606 Support SSO on Studio
https://jira.talendforge.org/browse/TUP-32606
2022-09-26 09:43:36 +08:00
tsasada-talend
857f4dca9a Add localized files (#5627)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-09-22 17:40:58 +08:00
zyuan-talend
dd51ba9623 fix(TUP-36519):"Detect and update all jobs" does not update all jobs. (#5596) (#5623) 2022-09-22 16:47:56 +08:00
sbliu
e7dc81d3e2 feat(TUP-36340) fix problem that still show missing orai18n jar . (#5617)
fix problem that press finish button show missing orai18n jar .
2022-09-21 17:13:56 +08:00
zshen-talend
d013b64aa3 fix(TDQ-19700):snowflake type don't should show on the combo list of DB (#5604)
* fix(TDQ-19700):snowflake type don't should show on the combo list of DB
wizard

* fix(TDQ-19700): second time switch context failed when schema is empty
2022-09-20 12:23:38 +08:00
Alexiane Yvonet
94538f8b82 Add localized files (#5598)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-09-16 09:58:56 +08:00
Emmanuel GALLOIS
88bb49e6ba feat(TDI-48418): Bump component-runtime to 1.48 (#5592) 2022-09-15 11:42:20 +02:00
zshen-talend
732c9f7ba3 fix(TDQ-19700): fix the bug about second time switch change original value(#5597) 2022-09-15 12:19:06 +08:00
AlixMetivier
e7d7296d1d feat(TBD-13647): allow switch from transient to interactive cluster (#5424) (#5586)
Co-authored-by: unknown <ametivier@talend.com>

Co-authored-by: AlixMetivier-zz <50327620+AlixMetivier-zz@users.noreply.github.com>
2022-09-13 08:38:38 +02:00
zyuan-talend
cff426e05b fix(TUP-35745): Research: Bring a dark mode for Talend Studio. (#5582)
* fix(TUP-35745): Research: Bring a dark mode for Talend Studio as
Experimental.

* fix(TUP-35745): Research: Bring a dark mode for Talend Studio.
2022-09-13 10:49:07 +08:00
jzhangbj
3942a7342a Add localized files (#5585)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-09-09 17:25:01 +08:00
tsasada-talend
cac70d58bd Add localized files (#5583)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-09-09 15:13:50 +08:00
sbliu
a68d173505 feat(TUP-36340) oracle add support of orai18n.jar (#5528) (#5581)
orai18n jar version using 19, same as ojdbc version of oracle 18,
support nls feature only apply to oracle 18
2022-09-08 11:08:10 +08:00
Liu Xinquan
c9a6da75a9 Xqliu/tdq 20610 lucene core master (#5568) 2022-09-06 17:19:03 +08:00
hzhao
dd67814905 fix(TUP-36593): Nexus proxy password is stored in clear text in project (#5562) (#5577) 2022-09-06 09:34:26 +08:00
zshen-talend
9168a6f562 feat(TDQ-19700): add condition to avoid junit failed (#5574) 2022-09-05 22:12:32 +08:00
zshen-talend
214124111d Zshen/feat/tdq 19700 3support switch context for snowflake jdbc (#5567) (#5572) 2022-09-02 21:24:57 +08:00
sbliu
312478cf8e fix junit failure (#5559) (#5565) 2022-09-02 14:26:52 +08:00
bhe-talendbj
0eaca0c7ce feat(TUP-36373): Delete .m2 with UI option when apply a monthly update (#5549) (#5556)
* feat(TUP-36373): initial impl

* feat(TUP-36373): delete m2 during startup

* feat(TUP-36373): delete m2 during startup
2022-09-01 16:54:37 +08:00
msjian
176c01a871 chore(TDQ-20612): a wording issue (#5560) 2022-09-01 16:35:41 +08:00
Oleksandr Zhelezniak
d47cb925a1 fix(TDI-48431): synchronize flush resumeutil (#5551) 2022-09-01 10:08:10 +03:00
sbieliaievl
8f10d203c2 fix(APPINT-34899) - added constants for cloud version change (#5541) 2022-09-01 08:49:05 +03:00
hcyi
1eb962e58b fix(TUP-36483):Code generation fails with xmlmap. (#5542) 2022-08-30 17:56:53 +08:00
bhe-talendbj
60cb70dda8 feat(TUP-35886): add new method to rename tck component name (#5436) (#5555)
* feat(TUP-35886): add new method to rename tck component name

* feat(TUP-35886): add junit

* feat(TUP-35886): add junit

* feat(TUP-35886): refactor name

* feat(TUP-35886): fix junit

* feat(TUP-35886): fix junit

* feat(TUP-35886): refactor and update doc
2022-08-30 17:28:48 +08:00
jiezhang-tlnd
3d4f36615b fix(TUP-35898)Studio does not display an error message when importing (#5398)
* fix(TUP-35898)Studio does not display an error message when importing
bad zip job archive

* format code
2022-08-30 09:31:54 +08:00
sbliu
86b682b026 chore(TUP-36502) upgrade org.postgresql:postgresql:42.2.25 to 42.2.26 (#5547) 2022-08-29 16:37:47 +08:00
Jane Ding
8ef7d24ab1 feat(TUP-35712):Track item signature with Pendo (#5499) (#5554)
* feat(TUP-35712):Track item signature with Pendo
https://jira.talendforge.org/browse/TUP-35712

* feat(TUP-35712):Track item signature with Pendo
https://jira.talendforge.org/browse/TUP-35712

* feat(TUP-35712):Track item signature with Pendo
https://jira.talendforge.org/browse/TUP-35712

* feat(TUP-35712):Track item signature with Pendo
https://jira.talendforge.org/browse/TUP-35712

* feat(TUP-35712):Track item signature with Pendo
https://jira.talendforge.org/browse/TUP-35712

* feat(TUP-35712):Track item signature with Pendo
https://jira.talendforge.org/browse/TUP-35712

* feat(TUP-35712):Track item signature with Pendo
https://jira.talendforge.org/browse/TUP-35712

* feat(TUP-35712):Track item signature with Pendo
https://jira.talendforge.org/browse/TUP-35712

* feat(TUP-35712):Track item signature with Pendo
https://jira.talendforge.org/browse/TUP-35712

* feat(TUP-35712):Track item signature with Pendo
https://jira.talendforge.org/browse/TUP-35712

* feat(TUP-35712):Track item signature with Pendo
https://jira.talendforge.org/browse/TUP-35712

* feat(TUP-35712):Track item signature with Pendo
https://jira.talendforge.org/browse/TUP-35712

* feat(TUP-35712):Track item signature with Pendo
https://jira.talendforge.org/browse/TUP-35712

* feat(TUP-35712):Track item signature with Pendo
https://jira.talendforge.org/browse/TUP-35712

* feat(TUP-35712):Track item signature with Pendo
https://jira.talendforge.org/browse/TUP-35712

* feat(TUP-35712):Track item signature with Pendo
https://jira.talendforge.org/browse/TUP-35712

* feat(TUP-35712):Track item signature with Pendo
https://jira.talendforge.org/browse/TUP-35712
2022-08-29 10:22:07 +08:00
sbieliaievl
2f62d6b559 fix(APPINT-34581) - added method for feature version and groupId (#5535) 2022-08-26 11:26:37 +03:00
zyuan-talend
a856a6dfef fix(TUP-35909):add missed context items for demo. (#5518) (#5532) 2022-08-10 19:17:05 +08:00
hzhao-talendbj
57d7f049f1 fix(TUP-36341): Unable to run DQ reports with subjob+joblet on a cloud (#5517) (#5534)
* fix(TUP-36341): Unable to run DQ reports with subjob+joblet on a cloud

* fix(TUP-36341): Unable to run DQ reports with subjob+joblet on a cloud

* (TUP-36341): Unable to run DQ reports with subjob+joblet on a cloud
2022-08-10 16:58:14 +08:00
hcyi
e5858570fd fix(TUP-36012):CVE:com.h2database:h2:2.1.210 (#5455) 2022-08-09 11:00:40 +08:00
jiezhang-tlnd
1c7284282f fix(TUP-36127)Upgrade commons-configuration to 2.8.0 (#5522) 2022-08-09 09:48:50 +08:00
ypiel
2cf0e2f063 chore: bump to component-runtime 1.47.0 (#5490)
* bump to 1.47.1

Co-authored-by: Emmanuel GALLOIS <egallois@talend.com>
2022-08-08 13:43:01 +02:00
wang wei
a2f23b8c70 fix(TDI-48203): fix for microservice case (#5526) (#5527) 2022-08-05 16:22:06 +08:00
Jane Ding
4bc2f2212f feat(TUP-35644):tMap - possible simplified metrics to send to Pendo (#5524) (#5525)
https://jira.talendforge.org/browse/TUP-35644
2022-08-05 10:17:45 +08:00
Alexiane Yvonet
b3aeb8789f Add localized files (#5520)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-08-04 17:02:17 +08:00
Zhiwei Xue
cdf3f74dab fix(TUP-36175):align bcprov-jdk15on to 1.70 (#5461) (#5515) 2022-08-02 15:32:02 +08:00
tsasada-talend
03ec9564c4 Add localized files (#5506)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-29 15:35:09 +08:00
jzhangbj
2e100d48ec Add localized files (#5505)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-29 15:34:28 +08:00
kjwang
9d53e9e58a TUP-36242 jobs changing Hadoop metadata distribution after changing (#5484) (#5504)
TUP-36242 jobs changing Hadoop metadata distribution after changing project/branch
https://jira.talendforge.org/browse/TUP-36242
2022-07-28 16:19:08 +08:00
jiezhang-tlnd
7f982eb19f handle mssql metedata (#5501) 2022-07-27 18:44:27 +08:00
sbliu
8955b487d3 feat(TUP-29393) replace nexus connection timeout with default connection timeout (#5475) (#5500) 2022-07-27 17:58:07 +08:00
jiezhang-tlnd
0cbabe1194 fix(TUP-35446)CVE: org.apache.maven:maven-core:3.8.3 (#5446) (#5498) 2022-07-27 15:08:50 +08:00
wang wei
cf06ba240f fix(TDI-48203): [CVE]: routines.system.JSONObject(Object bean) use reflect to call method invoke, that's dangerous for evil script inject (#5426) (#5497) 2022-07-27 09:51:20 +08:00
sbliu
eb72dad972 fix(TUP-36252) fix NPE for tos studio build job (#5489) 2022-07-26 14:25:34 +08:00
jiezhang-tlnd
ae1b095e14 Jzhang/tup 35808 (#5493)
* feat(TUP-35808)Generate module name from maven url
https://jira.talendforge.org/browse/TUP-35808

* feat(TUP-35808)Generate module name from maven url

* handle warning

* format code

* add conditions of debug mode

* print for plugin
2022-07-25 18:08:48 +08:00
sbliu
6f3a8112ed chore(TUP-35865) upgrade wstx-asl-3.2.9.jar with wstx-core-asl-4.4.1 and stax2-api-4.2.1 (#5439) 2022-07-22 17:28:16 +08:00
Zhiwei Xue
963980d17f fix(TUP-18979):Migration tasks including mapping files (#5495)
* fix(TUP-18979):Migration tasks including mapping files (#5441)

* fix(TUP-18979):Fix UI import issue (#5457)

* fix(TUP-18979):fix sync mapping file error of job project (#5470)

* fix(TUP-18979):fix junit failure (#5492)
2022-07-22 16:51:40 +08:00
tsasada-talend
3a33d78ae6 Add localized files (#5487)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-21 16:43:25 +08:00
Alexiane Yvonet
83e56b11a4 Add localized files (#5486)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-21 15:40:36 +08:00
sbliu
578cf0a774 chore(TUP-35948) TP_ALL as cloud/on-prem license (#5445) (#5483) 2022-07-21 10:58:28 +08:00
hzhao-talendbj
2344240c7b Revert "chore(TUP-35265): upgrade 'crypto-utils' jar in low level (#5372) (#5431)" (#5478)
This reverts commit 14784e24f5.
2022-07-19 16:55:32 +08:00
jiezhang-tlnd
99483397a6 Revert "Revert "feat(TUP-35808)Generate module name from maven url (#5449)" (#5453)" (#5479)
This reverts commit ca40e6dbde.
2022-07-19 16:04:54 +08:00
pyzhou
75ea7c06bc fix(TDI-48024): ResumeUtil performance issue (#5458)
* fix(TDI-48024): ResumeUtil performance issue

* NPE
2022-07-19 10:30:46 +08:00
zyuan-talend
55ed44cc68 fix(TUP-36231,TUP31721): deploy libs from custom component. (#5468) (#5474) 2022-07-19 10:07:21 +08:00
sbliu
0d629ea96b chore(TUP-35863) remove lower version of maven-settings (#5419) (#5469)
* chore(TUP-35863) remove lower version of maven-settings
2022-07-18 10:06:41 +08:00
tsasada-talend
59019ed6b7 Add localized files (#5465)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-15 16:15:05 +08:00
jzhangbj
fbbc76d7b4 Add localized files (#5462)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-15 16:11:53 +08:00
Jane Ding
4cd166d665 feat(TUP-35644):tMap - possible simplified metrics to send to Pendo (#5409) (#5460)
* feat(TUP-35644):tMap - possible simplified metrics to send to Pendo
https://jira.talendforge.org/browse/TUP-35644

* feat(TUP-35644):tMap - possible simplified metrics to send to Pendo
https://jira.talendforge.org/browse/TUP-35644

* feat(TUP-35644):tMap - possible simplified metrics to send to Pendo
https://jira.talendforge.org/browse/TUP-35644

* feat(TUP-35644):tMap - possible simplified metrics to send to Pendo
https://jira.talendforge.org/browse/TUP-35644
2022-07-14 18:08:16 +08:00
zshen-talend
17e7da24a5 feat(TDQ-19828): make sure tDataQualityRule support spark job (#5434) 2022-07-14 16:47:56 +08:00
sbieliaievl
9a049b37b4 fix(APPINT-33559) - fixed screenshot is not available in demos (#5349)
* fix(APPINT-33559) - added sreenshots to DI demo jobs

* fix(APPINT-33559) - fixed for screenshot is not available in demos
2022-07-14 10:50:49 +03:00
sponomarova
ecc63405e8 feat(TBD-13825): GA - Azure Synapse Spark pools with Azure AD Service Principal (#5427) (#5459) 2022-07-14 10:26:30 +03:00
jiezhang-tlnd
ca40e6dbde Revert "feat(TUP-35808)Generate module name from maven url (#5449)" (#5453)
This reverts commit d8096aac9e.
2022-07-12 16:58:12 +08:00
sbliu
0871206151 fix(TUP-32331) fix unit failure. (#5450) 2022-07-11 18:06:08 +08:00
jiezhang-tlnd
d8096aac9e feat(TUP-35808)Generate module name from maven url (#5449)
https://jira.talendforge.org/browse/TUP-35808
2022-07-11 17:47:00 +08:00
hcyi
ae712faa42 fix(TUP-35774):The prompt feature for context variables. (#5377) 2022-07-07 17:09:43 +08:00
Emmanuel GALLOIS
a8d2f77ff3 feat(TDI-48200) bump component-runtime to 1.46 (#5421)
* feat(TDI-48200): bump component-runtime to 1.46.1
2022-07-07 10:29:15 +02:00
sbliu
0ba728d04b fix(TUP-32331) fix cannot translate to valid file path when url contains special '#' (#5363) 2022-07-07 14:57:05 +08:00
hzhao-talendbj
14784e24f5 chore(TUP-35265): upgrade 'crypto-utils' jar in low level (#5372) (#5431) 2022-07-06 09:53:46 +08:00
zyuan-talend
38b4af1cb3 fix(TUP-31721):Not clear studio index cache in normal case. (#5350) (#5418) 2022-07-01 19:34:33 +08:00
hzhao-talendbj
2650d58b92 fix(TUP-35645): Studio update git for nothing (#5335) (#5420) 2022-07-01 16:12:26 +08:00
jiezhang-tlnd
c3c0ab4ba3 fix(TUP-35979)Adjust nimbus-jose-jwt-9.3.jar to nimbus-jose-jwt-9.22 (#5417) 2022-06-30 14:32:51 +08:00
jiezhang-tlnd
c5d8c027c5 chore(TUP-35857)CVE: bsh-2.0b4.jar (#5382) 2022-06-30 09:47:53 +08:00
zyuan-talend
ac3661a318 fix(TUP-35823): CVE consolidate maven-artifact-manager to 2.2.1. (#5383) (#5416) 2022-06-29 18:00:53 +08:00
bhe-talendbj
d1a7a88ea4 chore(TUP-35849): add classifier support (#5408) (#5411) 2022-06-28 20:17:03 +08:00
bhe-talendbj
c9ab88d487 fix(TUP-35637): not clean target folders (#5374) (#5414) 2022-06-28 20:08:11 +08:00
Xuwei ZHU
7935b2918a Add localized files (#5405)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-06-23 18:05:27 +08:00
Alexiane Yvonet
07ad5653b0 Add localized files (#5401)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-06-23 17:48:37 +08:00
jzhangbj
b0c4d195b5 Add localized files (#5384)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-06-23 17:32:04 +08:00
Chao MENG
6e264d3b27 chore: update plugin timestamp (#5404) 2022-06-23 17:14:28 +08:00
Jane Ding
87f1925422 fix(TUP-35599):SuggestionValues.Item support of user friendly UI label (#5351) (#5399)
* fix(TUP-35599):SuggestionValues.Item support of user friendly UI label
different from it's id
https://jira.talendforge.org/browse/TUP-35599

* fix(TUP-35599):SuggestionValues.Item support of user friendly UI label
different from it's id
https://jira.talendforge.org/browse/TUP-35599
2022-06-22 09:51:26 +08:00
Liu Xinquan
bc2c79b739 fix(TDQ-20474) jfreechart issue (#5394) 2022-06-20 20:12:48 +08:00
msjian
d97b8c1ba1 fix(TDQ-19435): fxi NPE and remove useless jars (#5392) 2022-06-20 10:01:04 +08:00
Liu Xinquan
9136eeef2a fix(TDQ-20360) snowflake jdbc connection context mode issue (#5389) 2022-06-17 16:38:35 +08:00
Liu Xinquan
912c92b47d fix(TDQ-20360) snowflake jdbc connection context mode issue (#5379) 2022-06-17 10:51:48 +08:00
sponomarova
94e35f82ad feat(TBD-13824): Spark 3.2.x standalone GA (#5322) (#5387) 2022-06-16 12:56:41 +03:00
Xuwei ZHU
5be8e0e9ba Add localized files (#5385)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-06-16 16:59:11 +08:00
jiezhang-tlnd
e3b53afa78 feat(TUP-35192)Hide the Debug->Modules from show view (#5369)
https://jira.talendforge.org/browse/TUP-35192
2022-06-16 16:54:59 +08:00
hcyi
90db7fd444 fix(TUP-35508):Better to improve context prompt for JDBC. (#5371)
* fix(TUP-35508):Better to improve context prompt for JDBC.

* fix(TUP-35508):Better to improve context prompt for JDBC.
2022-06-14 15:08:37 +08:00
Jane Ding
d0846226f2 feat(TUP-33085):Add Icon(s) to open Help (#5328) (#5367)
* feat(TUP-33085):Add Icon(s) to open Help
https://jira.talendforge.org/browse/TUP-33085

* feat(TUP-33085):Add Icon(s) to open Help
https://jira.talendforge.org/browse/TUP-33085

* feat(TUP-33085):Add Icon(s) to open Help
https://jira.talendforge.org/browse/TUP-33085

* feat(TUP-33085):Add Icon(s) to open Help
https://jira.talendforge.org/browse/TUP-33085
fix(TUP-35782):[bug] button 'Online help' can't work for some TCK
components
https://jira.talendforge.org/browse/TUP-35782

* feat(TUP-33085):Add Icon(s) to open Help
https://jira.talendforge.org/browse/TUP-33085

* feat(TUP-33085):Add Icon(s) to open Help
https://jira.talendforge.org/browse/TUP-33085
2022-06-10 17:25:51 +08:00
bhe-talendbj
a138fcf717 feat(TUP-33929): remove duplicated sub modules from parent (#5235) (#5362)
* feat(TUP-33929): remove duplicated sub modules from parent

* feat(TUP-33929): refactor

* feat(TUP-33929): add logs for profile mode
2022-06-10 11:00:25 +08:00
qiongli
0fda005a81 fix(TDQ-20442):Split 'handelDQComponents()' so as to handle 2 DQ components(#5356) 2022-06-10 10:28:26 +08:00
Emmanuel GALLOIS
d732ace073 feat(TDI-48010): bump component-runtime to 1.45.2 (#5326)
* feat(TDI-48010): bump component-runtime to 1.45.0
* feat(TDI-48010): bump component-runtime to 1.45.1
2022-06-09 10:12:46 +02:00
Oleksandr Zhelezniak
1975cb6c91 feat(TDI-48013): jackson align (#5346)
* bump version of Jackson libraries to 2.13.2 and 2.13.2.2
2022-06-09 10:05:48 +03:00
jiezhang-tlnd
d7a5a1df18 fix(TUP-35826)link path generated is not correct for tRunjob (#5365) 2022-06-09 12:27:38 +08:00
jiezhang-tlnd
440bb28bad fix(TUP-35539)Netsuite parent node show as Items missing parent node (#5332) (#5366)
* fix(TUP-35539)Netsuite: parent node show as "Items missing parent node
(Deprecated)" after import or do delete the datastore directly
https://jira.talendforge.org/browse/TUP-35539

* export dataset need with datastore

* format code

* handle reference project case

* handle import issue

* improve code

* improve code

* improve code
2022-06-09 10:58:34 +08:00
msjian
4e899b26ae "fix(TDQ-20476) : add jboss-marshalling-2.0.12.Final.jar to build to fix run analysis get error" (#5360) 2022-06-08 16:22:37 +08:00
jiezhang-tlnd
8121aac04a fix(TUP-35683)doc use job for route, joblet for routelet (#5357) (#5361)
https://jira.talendforge.org/browse/TUP-35683
2022-06-08 15:35:15 +08:00
jiezhang-tlnd
9d10c65295 feat(TUP-34931)Support Sybase 17 (#5236) (#5359)
* feat(TUP-34931)Support Sybase 17

* add library needed
2022-06-08 10:59:21 +08:00
msjian
d2a2704284 fix(TDQ-20476) : add two jars to fix run analysis get error (#5354) 2022-06-07 18:59:06 +08:00
hcyi
56d12c0b6c feat(TUP-34855):Setup custom JKS for job signature from GUI. (#5324)
* feat(TUP-34855):Setup custom JKS for job signature from GUI.

* feat(TUP-34855):hide password in mvn command

* feat(TUP-34855):Setup custom JKS for job signature from GUI
2022-06-02 10:58:42 +08:00
jiezhang-tlnd
6a9906ab66 feat(TUP-28853)tRunjob is ok, need handle joblet (#5269) (#5342)
* feat(TUP-28853)tRunjob is ok, need handle joblet

* generation document is ok from standard process

* format code

* improve performance

* format code

* improve performance

* format code

* improve performance

* handle latest version

* handle route process

* format code

* format code
2022-05-31 17:41:58 +08:00
sbliu
4ae3b77c22 chore(TUP-35684) upgrade xmlbeans. (#5340) 2022-05-31 16:12:39 +08:00
bhe-talendbj
aa4ad41f67 chore(TUP-35685): upgrade database driver version (#5330) (#5341) 2022-05-31 14:34:56 +08:00
Chao MENG
5575e21252 feat(TUP-33655): Improve Git pull & Merge if current branch and target (#5306)
branch are on different monthly update.
https://jira.talendforge.org/browse/TUP-33655
2022-05-31 10:11:51 +08:00
Oleksandr Zhelezniak
7007071c9c fix(TDI-45946): greenplum mapping (#5278)
* add TIMESTAMP WITH TIME ZONE
* add TIME WITH TIME ZONE
2022-05-30 16:10:02 +03:00
sbliu
1067aa86a9 fix(TUP-35598) fix OutOfMemoryError: Metaspace (#5334) 2022-05-30 16:39:11 +08:00
Alexiane Yvonet
9bade7f379 Add localized files (#5336)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-05-30 15:41:46 +08:00
sbliu
22b3f2f2b2 chore(TUP-35445) upgrade guava to 30.0-jre (#5329) 2022-05-26 16:49:45 +08:00
bhe-talendbj
84f943f02c fix(TUP-35518): fix dropdownlist of context (#5288) 2022-05-26 16:07:27 +08:00
Zhiwei Xue
a1552068da fix(TUP-31233):Routine pom is not updated after installed the required (#5315)
* fix(TUP-31233):Routine pom is not updated after installed the required
jar of user routine

* fix(TUP-31233):Routine pom is not updated after installed the required
jar of user routine
2022-05-25 18:05:05 +08:00
hzhao-talendbj
53c93755d4 Revert "chore(TUP-34757): Add a getOriginalName() in IConnection (#5124)" (#5323)
This reverts commit f6ab6a6358.
2022-05-25 17:28:13 +08:00
Chao MENG
a389284310 fix(TUP-35616): Problems on the \ processing on the password field after TUP-32821 (#5318)
* fix(TUP-35616): Problems on the \ processing on the password field after
TUP-32821
https://jira.talendforge.org/browse/TUP-35616

* Update ElementParameterParser.java

* fix(TUP-35616): Problems on the \ processing on the password field after
TUP-32821
https://jira.talendforge.org/browse/TUP-35616

* fix(TUP-35616): Problems on the \ processing on the password field after
TUP-32821
https://jira.talendforge.org/browse/TUP-35616

* fix(TUP-35616): Problems on the \ processing on the password field after
TUP-32821
https://jira.talendforge.org/browse/TUP-35616
2022-05-19 19:25:04 +08:00
hcyi
464fd2feb4 fix(TUP-35607):should no prompt for analysis when DB connection have context group with Multiple db set (#5314)
* fix(TUP-35607):should no prompt for analysis when DB connection have
context group with Multiple db set

* fix(TUP-35607):should no prompt for analysis when DB connection have
context group with Multiple db set

* fix(TUP-35607):should no prompt for analysis when DB connection have
context group with Multiple db set
2022-05-19 17:48:31 +08:00
jzhangbj
5f563129d7 Add localized files (#5317)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-05-19 17:46:59 +08:00
tsasada-talend
5fbd8704b8 Add localized files (#5316)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-05-19 17:42:16 +08:00
Jane Ding
c59b0ca732 fix(TUP-33119):SuggestionValues.Item label is received at runtime (#5312)
* Revert "fix(TUP-33119):SuggestionValues.Item label is received at runtime (#5139)" (#5301)

This reverts commit 9d2f2d25ae.

* fix(TUP-33119):SuggestionValues.Item label is received at runtime (#5303)

instead of id when used inside table
https://jira.talendforge.org/browse/TUP-33119
2022-05-19 09:50:19 +08:00
Emmanuel GALLOIS
f2617c44d8 feat(TDI-47911): bump component-runtime to 1.44.3 (#5275) 2022-05-13 09:55:08 +02:00
Jane Ding
2864ee34fc fix(TUP-35538):failed to run job when studio is Chinese on R04 (#5295) (#5297)
* fix(TUP-35538):failed to run job when studio is Chinese on R04
https://jira.talendforge.org/browse/TUP-35538

* fix(TUP-35538):failed to run job when studio is Chinese on R04
https://jira.talendforge.org/browse/TUP-35538
2022-05-13 10:43:06 +08:00
bhe-talendbj
1f5a8d8f2d fix(TUP-35541): replace log4j-1.x (#5294) 2022-05-13 10:37:20 +08:00
tsasada-talend
9b997b7c2d Add localized files (#5287)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-05-12 20:40:02 +08:00
Chao MENG
92c1dae673 Cmeng/feat/tup 33928 tmc update (#5230)
* feat(TUP-33928): Controlled Studio Updates from TMC
https://jira.talendforge.org/browse/TUP-33928
2022-05-12 18:56:25 +08:00
Chao MENG
d399ff74c0 feat(TUP-32821): Credential property value in json format in tck (#5242)
framework
https://jira.talendforge.org/browse/TUP-32821
2022-05-12 18:35:02 +08:00
Liu Xinquan
5846e53045 chore(TDQ-20339) improve mvn path: org.talend.libraries.jfreechart (#5284) 2022-05-12 17:18:11 +08:00
hcyi
e0b9d739d9 feat(TUP-34889): Support to prompt Context on Metadata (#5260)
* feat(TUP-34889):Support to prompt Context on Metadata Connection

* feat(TUP-34889):Support to prompt Context on Metadata Connection

* feat(TUP-34889):Support to prompt Context on Metadata Connection

* feat(TUP-34889):active the prompt when export as context

* feat(TUP-34889):improve for Support to prompt Context on Metadata
Connection

* feat(TUP-34889):add junits and improve.

* feat(TUP-34889):update messages

* feat(TUP-34889):fix bug TUP-35369

* feat(TUP-34889): fix a bug .

* feat(TUP-34889):fix bug TUP-35503 and TUP-35504

* feat(TUP-34889):improve if multiple context group but not prompt .
2022-05-12 17:12:44 +08:00
Jane Ding
9f7e427415 fix(TUP-33119):SuggestionValues.Item label is received at runtime (#5139) (#5282)
instead of id when used inside table
https://jira.talendforge.org/browse/TUP-33119
2022-05-12 09:41:11 +08:00
Jane Ding
c8518176c2 fix(TUP-35315):Redshift SSO support driver 2.x (#5241) (#5281)
* feat(TUP-35069):Upgrade Redshift driver to v2.x
https://jira.talendforge.org/browse/TUP-35069

* feat(TUP-35069):Upgrade Redshift driver to v2.x
https://jira.talendforge.org/browse/TUP-35069

* fix(TUP-35315):Redshift SSO support driver 2.x
https://jira.talendforge.org/browse/TUP-35315

* fix(TUP-35315):Redshift SSO support driver 2.x
https://jira.talendforge.org/browse/TUP-35315
fix(TUP-35356):[Bug] Redshiftsso can not check pass and throw error log
"java.lang.NoClassDefFoundError: com/amazonaws/auth/AWSCredentials"

* fix(TUP-35315):Redshift SSO support driver 2.x
https://jira.talendforge.org/browse/TUP-35315
fix(TUP-35356):[Bug] Redshiftsso can not check pass and throw error log
"java.lang.NoClassDefFoundError: com/amazonaws/auth/AWSCredentials"

* fix(TUP-35315):Redshift SSO support driver 2.x
https://jira.talendforge.org/browse/TUP-35315
fix(TUP-35356):[Bug] Redshiftsso can not check pass and throw error log
"java.lang.NoClassDefFoundError: com/amazonaws/auth/AWSCredentials"

* fix(TUP-35315):Redshift SSO support driver 2.x
https://jira.talendforge.org/browse/TUP-35315
fix(TUP-35411):[Bug] When create redshift sso use driver 2, studio can
not load the properties ok.

* fix(TUP-35315):Redshift SSO support driver 2.x
https://jira.talendforge.org/browse/TUP-35315
fix(TUP-35424):[Bug] studio throw NPE error log when save tredshiftsso
component to a built-in metadata.

* fix(TUP-35315):Redshift SSO support driver 2.x
https://jira.talendforge.org/browse/TUP-35315

* fix(TUP-35315):Redshift SSO support driver 2.x
https://jira.talendforge.org/browse/TUP-35315

* fix(TUP-35315):Redshift SSO support driver 2.x
https://jira.talendforge.org/browse/TUP-35315

* fix(TUP-35315):Redshift SSO support driver 2.x
https://jira.talendforge.org/browse/TUP-35315
2022-05-12 09:41:01 +08:00
Zhiwei Xue
e1c7e428d5 fix(TUP-35219):Nullpointer exception with building job on (#5263)
commandline-script mode
2022-05-09 10:10:58 +08:00
Zhiwei Xue
dca56893d6 fix(TUP-34109):[7.3.1] slow project export compared to studio 6.5.1 (#5201) 2022-05-09 10:08:19 +08:00
hcyi
9625813d52 fix(TUP-35248):Context password exposed when hovering over context on Talend 8 (#5261)
* fix(TUP-35248):Context password exposed when hovering over context on
Talend 8

* fix(TUP-35248):add junits
2022-05-06 15:56:35 +08:00
Chao MENG
54ac7a583c fix(TUP-35048): Job takes about 30-60 minutes to build in Studio (#5221)
* fix(TUP-35048): Job takes about 30-60 minutes to build in Studio
https://jira.talendforge.org/browse/TUP-35048

* fix(TUP-35048): Job takes about 30-60 minutes to build in Studio
https://jira.talendforge.org/browse/TUP-35048

Add junit
2022-05-05 17:28:31 +08:00
tsasada-talend
b343fc696d Add localized files (#5272)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-05-05 16:33:11 +08:00
tsasada-talend
22d6e282bd Add localized files (#5267)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-28 18:04:51 +08:00
Alexiane Yvonet
2e5ce25858 Add localized files (#5266)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-28 15:38:03 +08:00
hzhao-talendbj
10795fff34 chore(TUP-35039):CVE: com.fasterxml.jackson (#5226) (#5265) 2022-04-26 16:01:40 +08:00
tsasada-talend
7dfa2eebce Add localized files (#5256)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-22 17:43:46 +08:00
yyin
2987fe469c Feat TDQ-20141 add algoVersion (#5211) 2022-04-22 14:36:25 +08:00
bhe-talendbj
956abe83b8 feat(TUP-34987): Identify Jobs having CVEs remediated improvement. (#5159) (#5250)
* feat(TUP-34987): add cache

* feat(TUP-34987): refactor

* feat(TUP-34987): add cache
2022-04-22 14:11:25 +08:00
jzhangbj
e86f20034f Add localized files (#5252)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-22 09:53:25 +08:00
Alexiane Yvonet
7336527f95 Add localized files (#5251)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-22 09:50:16 +08:00
sponomarova
374f9492a5 feat(TBD-13632): Dataproc GA (#5104) (#5248) 2022-04-20 14:57:25 +03:00
Jane Ding
11c490915d feat(TUP-35069):Upgrade Redshift driver to v2.x (#5228)
https://jira.talendforge.org/browse/TUP-35069
2022-04-19 17:42:12 +08:00
zyuan-talend
e7aebe7116 fix(TUP-35195): Deploy studio index to oss. (#5215) (#5232) 2022-04-19 14:59:01 +08:00
Chao MENG
5aebe62348 chore: fix swtbot issue (#5238) 2022-04-19 11:12:51 +08:00
Zhiwei Xue
93386c0cc7 fix(TUP-35302):Maven URI isn't updated if install R2022-03v2 first then (#5234)
install R2022-04
2022-04-18 14:23:24 +08:00
Laurent BOURGEOIS
ff70a4b197 feat(TBD-13522):CDE - GA (#5161) (#5225) 2022-04-15 21:56:33 +03:00
Jane Ding
39d054b31e feat(TUP-35069):Upgrade Redshift driver to v2.x (#5192) (#5219)
* feat(TUP-35069):Upgrade Redshift driver to v2.x
https://jira.talendforge.org/browse/TUP-35069

* feat(TUP-35069):Upgrade Redshift driver to v2.x
https://jira.talendforge.org/browse/TUP-35069

* feat(TUP-35069):Upgrade Redshift driver to v2.x
https://jira.talendforge.org/browse/TUP-35069

* feat(TUP-35069):Upgrade Redshift driver to v2.x
https://jira.talendforge.org/browse/TUP-35069

* feat(TUP-35069):Upgrade Redshift driver to v2.x
https://jira.talendforge.org/browse/TUP-35069

* feat(TUP-35069):Upgrade Redshift driver to v2.x
https://jira.talendforge.org/browse/TUP-35069
fix(TUP-35236):[bug] Addition parameter table layout issue

* feat(TUP-35069):Upgrade Redshift driver to v2.x
https://jira.talendforge.org/browse/TUP-35069
fix(TUP-35249):[bug]Use string parameter and Addition parameter table
showed when switch to other DB type
2022-04-15 15:49:34 +08:00
sponomarova
8447d5f5f5 feat(TBD-13328): Synapse service principal (#5204) (#5217) 2022-04-15 09:10:03 +03:00
jzhangbj
4cce0c00ad Add localized files (#5214)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-14 16:30:53 +08:00
tsasada-talend
5b2404f809 Add localized files (#5213)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-14 16:07:23 +08:00
Chao MENG
377ba6743e Cmeng/feat/tup 31734 test branch (#5170)
* feat(TUP-31734): Prompt users to Test patches when migrating projects
https://jira.talendforge.org/browse/TUP-31734
2022-04-14 14:41:45 +08:00
hzhao-talendbj
e95f724d99 feat(TUP-34896): update url (#5210) 2022-04-13 16:31:02 +08:00
hzhao-talendbj
88d5b289a8 feat(TUP-34929): Support for MSSQL Database 2019 (#5163) (#5208)
* feat(TUP-34929): Support for MSSQL Database 2019

* feat(TUP-34929): Support for MSSQL Database 2019

* feat(TUP-34929): add dependency log4j

* feat(TUP-34929): Support for MSSQL Database 2019
2022-04-13 11:41:26 +08:00
hzhao-talendbj
f5788fab6b feat(TUP-34896): support teradata jdbc version 17 (#5168) (#5200)
* feat(TUP-34896): support teradata jdbc version 17

* feat(TUP-34896): support teradata jdbc version 17
2022-04-11 14:58:57 +08:00
jiezhang-tlnd
6464441a63 remove log4j from org.talend.libraries.apache (#5199) 2022-04-08 16:13:20 +08:00
hcyi
8b52918dd6 feat(TUP-34849):Support retrieve SAP ADSOs metadata for provisioning. (#5156) 2022-04-08 10:59:50 +08:00
zyuan-talend
d5bbe89018 fix(TUP-35011):Improve Studio index build for monthly. (#5182) 2022-04-07 14:52:31 +08:00
qiongli
6affeef647 fix(TDQ-20222):Move backward 'handelDQComponents()' to avoid reset (#5178) 2022-04-06 16:14:48 +08:00
Alexiane Yvonet
5c1b7199f4 Add localized files (#5177)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-01 15:39:32 +08:00
jiezhang-tlnd
1601624fee fix(TUP-34954)CVE: Replace log4j1.x by reload4j (#5142) (#5181)
* fix(TUP-34954)CVE: Replace log4j1.x by reload4j (#5142)

* fix(TUP-34954)CVE: Replace log4j1.x by reload4j

* fix(TUP-34954)CVE: Replace log4j1.x by reload4j

* update driver version

* exclude log4j from slf4j-log4j12

* update maven-repository

Conflicts:
	main/plugins/org.talend.libraries.apache/META-INF/MANIFEST.MF

* remove bundle type
2022-04-01 15:37:13 +08:00
wang wei
b073fa0a6f fix(TDI-47633): CVE: Replace log4j1.x by reload4j or upgrade to log4j2 (#5183) 2022-04-01 15:18:16 +08:00
Emmanuel GALLOIS
a5daf7ffae feat(TDI-47414): bump component-runtime to 1.43.1 (#5172)
- fix misaligned openwebbeans-spi dependency
2022-03-30 18:37:58 +02:00
Zhiwei Xue
b80887ea80 fix(TUP-35133):Run a job with subjob failed after applied a patch with (#5166)
new version of CI-Builder
2022-03-30 17:40:27 +08:00
Chao MENG
5ddee59ca5 fix(TUP-35034): CI - stop the build if custom component is missing (#5150)
* fix(TUP-35034): CI - stop the build if custom component is missing
https://jira.talendforge.org/browse/TUP-35034

* fix(TUP-35034): CI - stop the build if custom component is missing
https://jira.talendforge.org/browse/TUP-35034
2022-03-30 16:09:11 +08:00
Oleksandr Zhelezniak
da7e03f68e fix(TDI-47651): bump Redshift driver to 1.2.55.1083 (#5153) 2022-03-25 11:47:04 +02:00
jzhangbj
5eaada3aba Add localized files (#5157)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-25 15:38:43 +08:00
Alexiane Yvonet
11d857350f Add localized files (#5148)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-24 17:10:28 +08:00
tsasada-talend
58dc50bb6b Add localized files (#5147)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-24 17:08:30 +08:00
Emmanuel GALLOIS
4a6676bbaa feat(TDI-47414): bump component-runtime to 1.43.0 (#5140) 2022-03-23 17:59:02 +01:00
jiezhang-tlnd
ac940b3379 chore(TUP-34977)Help links in Studio (#5133) 2022-03-21 15:22:48 +08:00
jzhangbj
b2de3dad81 Add localized files (#5136)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-18 10:36:33 +08:00
tsasada-talend
977dc22d8d Add localized files (#5134)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-18 10:34:26 +08:00
Alexiane Yvonet
360a6858d6 Add localized files (#5135)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-18 10:32:19 +08:00
kjwang
5f28859a41 Fix TUP-34930 Talend Studio 7.3 font color issues (#5102) (#5130)
Fix TUP-34930 Talend Studio 7.3 font color issues
https://jira.talendforge.org/browse/TUP-34930
2022-03-17 10:49:26 +08:00
jiezhang-tlnd
c81725aa46 add parameter datacenter (#5118) (#5127) 2022-03-15 10:15:27 +08:00
hzhao-talendbj
f6ab6a6358 chore(TUP-34757): Add a getOriginalName() in IConnection (#5124)
* chore(TUP-34757): Add a getOriginalName() in IConnection

* chore(TUP-34757): Add a getOriginalName() in IConnection
2022-03-11 17:35:42 +08:00
wang wei
bf10f9c18e fix(TDI-47154): send exception info for audit log (#4819) 2022-03-11 11:26:18 +08:00
jzhangbj
7b3696a646 Add localized files (#5115)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-11 09:43:19 +08:00
chmyga
ec04f46618 feat(TDI-46441): update mapping (#4646)
Co-authored-by: Dmytro Chmyga <dmytro.chmyga@globallogic.com>
Co-authored-by: Dmytro Sylaiev <dmytro.sylaiev@globallogic.com>
2022-03-10 18:45:21 +08:00
tsasada-talend
1c46738d0d Add localized files (#5114)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-10 18:35:46 +08:00
Alexiane Yvonet
8282a464c5 Add localized files (#5113)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-10 17:55:55 +08:00
bhe-talendbj
e8812cebf4 feat(TUP-33809): Studio commandline: DetectCVE to Get list of jobs impacted by CVE jars (#5022) (#5106)
* feat(TUP-33809): add detect cve service interface

* feat(TUP-33809): merge cveitem from different distributions

* feat(TUP-33809): add project name to report

* feat(TUP-33809): add columns to report header

* feat(TUP-33809): update report columns

* feat(TUP-33809): update report and cve index column names

* feat(TUP-33809): update usedbyTalend

* feat(TUP-33809): add getproductdate and test case

* feat(TUP-33809): fix test case

* feat(TUP-33809): revert from version changes

* feat(TUP-33809): by default not include fixed is false

* feat(TUP-33809): by default include not fixed is false

* feat(TUP-33809): add cvss colum for report

* feat(TUP-33809): update column name

* feat(TUP-33809): add clone of object
2022-03-10 17:28:21 +08:00
msjian
29328275ad fix(TDQ-19889): fix reload database functions for context prompt (#5111)
connection
2022-03-10 17:07:29 +08:00
Liu Xinquan
423ce93761 fix(TDQ-20069) new component DQ rules Part 2 for GA (DI standard job) (#5110) 2022-03-10 11:28:54 +08:00
msjian
243e453dbb feat(TDQ-19889):support analysis when using file connection prompt (#5093) 2022-03-10 10:04:52 +08:00
Jane Ding
6cfa26af6d fix(TUP-28898):Drag Exasol connection to a job choose tDBOutput(Exasol) (#5077) (#5108)
not work as tExasolOutput
https://jira.talendforge.org/browse/TUP-28898
2022-03-09 17:49:49 +08:00
Jane Ding
c564b3442d feat(TUP-33990):Pendo tracking for Studio integrations with API Designer (#5059) (#5107)
* feat(TUP-33990):Pendo tracking for Studio integrations with API Designer
& API Tester
https://jira.talendforge.org/browse/TUP-33990

* feat(TUP-33990):Pendo tracking for Studio integrations with API Designer
& API Tester
https://jira.talendforge.org/browse/TUP-33990

* feat(TUP-33990):Pendo tracking for Studio integrations with API Designer
& API Tester
https://jira.talendforge.org/browse/TUP-33990

* fix(TUP-34791):Add project reference to Project Login Pendo tracking
https://jira.talendforge.org/browse/TUP-34791

* fix(TUP-34791):Add project reference to Project Login Pendo tracking
https://jira.talendforge.org/browse/TUP-34791

* fix(TUP-34791):Add project reference to Project Login Pendo tracking
https://jira.talendforge.org/browse/TUP-34791
2022-03-09 17:48:35 +08:00
sbouyer
b5d0ccea4d Add localized files (#5105)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-09 15:16:42 +08:00
hcyi
8f9cf1151e fix(TUP-34427):Resource:"The system cannot find the path specified" (#5099)
error shows if build job first then run job and job calls child job
which using resource.
2022-03-09 14:45:06 +08:00
Emmanuel GALLOIS
e8a43d98fe feat(TDI-47609): bump component-runtime to 1.42.0 (#5089) 2022-03-08 11:10:34 +01:00
zshen-talend
35d862aed0 Zshen/feat/tdq 20069 improve t data quality rules for patch2 (#5096) 2022-03-07 17:24:34 +08:00
Zhiwei Xue
acb61a7ae4 workitem(TUP-34590):improve performance of import items for tuj (#5086) 2022-03-04 16:26:54 +08:00
jiezhang-tlnd
e430e1d470 fix(TUP-34772)com.h2database:h2:2.0.206 (#5045) (#5085) 2022-03-04 14:47:57 +08:00
tsasada-talend
dd1dbcb35d Add localized files (#5083)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-04 08:26:04 +08:00
Alexiane Yvonet
5d926326ce Add localized files (#5082)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
Co-authored-by: jiezhang-tlnd <40561780+jiezhang-tlnd@users.noreply.github.com>
2022-03-04 08:10:20 +08:00
tsasada-talend
db6a44c74a Add localized files (#5065)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-03 18:23:10 +08:00
Alexiane Yvonet
fedf5925e5 Add localized files (#5064)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-03 18:15:46 +08:00
kjwang
925ea11a94 Fix TUP-32950 On Ubuntu 18.04.5 documentation comment is displayed as a (#5078) (#5081)
Fix TUP-32950 On Ubuntu 18.04.5 documentation comment is displayed as a black box in Talend Studio designer tab
https://jira.talendforge.org/browse/TUP-32950
2022-03-03 17:10:29 +08:00
hcyi
c0fbf66e87 fix(TUP-34593):Cannot connect to Salesforce with password starting with double-quotes (#5066)
* fix(TUP-34593):Cannot connect to Salesforce with password starting with
double-quotes

* fix(TUP-34593):Cannot connect to Salesforce with password starting with
double-quotes

* fix(TUP-34593):Cannot connect to Salesforce with password starting with
double-quotes
2022-03-02 17:50:58 +08:00
Chao MENG
52f1dc38a3 fix(TBD-13493): Hive connection failed in Talend 8 with CDH 7.1.6 (#5057)
https://jira.talendforge.org/browse/TBD-13493
2022-03-01 17:02:13 +01:00
Jill Yan
4147beea33 Revert "APPINT-34310 remove lib folder for MS zip (#5040)" (#5070)
This reverts commit b528e5151d.
2022-02-25 16:29:25 +08:00
hzhao-talendbj
b094bb0aed chore(TUP-34729): remove jar which is not used by osgi or point to any (#5041) 2022-02-25 16:02:34 +08:00
sbliu
1dc9b02324 fix(TUP-34769) Error fields for Rejects get dropped from tSalesforceOutput after Sync Columns. (#5061) (#5062)
fix bug TUP-33497
2022-02-23 18:13:44 +08:00
Jill Yan
b528e5151d APPINT-34310 remove lib folder for MS zip (#5040)
Co-authored-by: jillyan <yan955599@gmail.com>
2022-02-22 14:42:18 +08:00
msjian
84176ff9e5 feat(TDQ-19889): Enabling the prompt context for profiling (#4991) 2022-02-21 11:17:27 +08:00
sponomarova
84990887da feat(TBD-12990): Dataproc TP (#5034) (#5054) 2022-02-18 14:57:58 +02:00
Jane Ding
4fa37a28ac Revert "fix(TUP-28898):Drag Exasol connection to a job choose tDBOutput(Exasol) (#4867)" (#5050) (#5053)
This reverts commit 21aed909e7.
2022-02-18 18:20:59 +08:00
ypiel
0e2cafa85a fix(TDI-47477): fix ParserUtils for date (#5048) 2022-02-18 10:20:28 +01:00
kjwang
f186a936b0 Revert "Fix TUP-32950 On Ubuntu 18.04.5 documentation comment is displayed as a (#4949) (#4985)" (#5044)
This reverts commit 084745f17b.
2022-02-17 17:43:35 +08:00
bhe-talendbj
13343894d4 fix(TUP-34682): fix required wrong bundle (#5029) (#5038)
fix(TUP-34682): fix required wrong bundle
2022-02-16 17:17:13 +08:00
Jane Ding
d95bfd2d0f fix(TUP-34401):Detect Dependencies is not working (#5033) (#5037)
https://jira.talendforge.org/browse/TUP-34401
2022-02-16 10:53:55 +08:00
sbliu
db7d1bada5 feat(TUP-34032): add field for context extraction. (#4958) 2022-02-15 14:21:23 +08:00
jiezhang-tlnd
dc7b4b7b80 fix(TUP-34438):CVE: com.h2database:h2:1.4.198 (#4981) (#5032)
* fix(TUP-34438):CVE: com.h2database:h2:1.4.198
https://jira.talendforge.org/browse/TUP-34438

* fix(TUP-34438):CVE: com.h2database:h2:1.4.198
https://jira.talendforge.org/browse/TUP-34438

* fix(TUP-34438):CVE: com.h2database:h2:1.4.198
https://jira.talendforge.org/browse/TUP-34438

* fix(TUP-34438):CVE: com.h2database:h2:1.4.198
https://jira.talendforge.org/browse/TUP-34438

* fix(TUP-34483)CVE: com.h2database:h2:1.4.198

Co-authored-by: jiezhang-tlnd <jie.zhang@talend.com>

Co-authored-by: Jane Ding <jding@talend.com>
2022-02-14 19:14:44 +08:00
Xilai Dai
2f83c5d741 (APPINT-33481) fix the missing jetty-all when cHttp as server for MS (#5002) 2022-02-14 17:13:48 +08:00
Jane Ding
63f2439835 fix(TUP-28898):Drag Exasol connection to a job choose tDBOutput(Exasol) (#4865)
not work as tExasolOutput
https://jira.talendforge.org/browse/TUP-28898
2022-02-14 10:25:45 +08:00
tsasada-talend
4b3a46c0a7 Add localized files (#5028)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-02-14 10:13:46 +08:00
kjwang
cc9357e0dc kjwang/Fix TUP-34660 TOS Cannot build job successfully (#5027)
kjwang/Fix TUP-34660 TOS Cannot build job successfully
https://jira.talendforge.org/browse/TUP-34660
2022-02-11 18:19:24 +08:00
zyuan-talend
aa6e1448c9 fix(TUP-34489):forward interpreter to child job in commandline. (#5025) 2022-02-10 14:07:15 +08:00
kjwang
94023733c2 TUP-34510 Wrong dependency on TOS build (#4993) (#5024)
TUP-34510 Wrong dependency on TOS build
https://jira.talendforge.org/browse/TUP-34510
2022-02-09 16:29:15 +08:00
tsasada-talend
2b5f0f269d Add localized files (#5019)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-02-07 10:19:13 +08:00
Jane Ding
d1e0e93e57 fix(TUP-34401):Detect Dependencies is not working (#4979) (#5012)
https://jira.talendforge.org/browse/TUP-34401
2022-01-30 14:43:13 +08:00
zyuan-talend
9424218a1d fix(TUP-33432): Improve feature manager top bar button for mac. (#5011) 2022-01-30 09:50:04 +08:00
hcyi
bffb520b0f fix(TUP-34595):we are trying to access api.eu.cloud.talend.com without (#5008)
passing through a proxy.
2022-01-29 11:15:50 +08:00
jiezhang-tlnd
7916c6f89a fix(TUP-34483)CVE org.apache.maven.shared maven-shared-utils [0.4,0.1] (#4996) 2022-01-28 17:01:51 +08:00
tsasada-talend
21ca6fe9bb Add localized files (#4999)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-01-28 11:36:23 +08:00
Emmanuel GALLOIS
7aa1e6ae24 feat(TDI-47414): bump component-runtime to 1.41.0 (#4982) 2022-01-27 09:20:12 +01:00
jiezhang-tlnd
0deaf29970 fix(TUP-31581)Remove CryptoHelper from test-studio-commandline (#4987) 2022-01-27 09:37:17 +08:00
jiezhang-tlnd
ee365b2d49 fix(TUP-34281): Cleanup of old translation files (#4951) 2022-01-26 18:30:37 +08:00
apoltavtsev
7234b250b8 feat(APPINT-32531) Make all DS/Route builds Java 11 and above compatible, design/build & run should work with different Java versions (#4821) 2022-01-25 17:10:53 +01:00
jiezhang-tlnd
d9d26530ca fix(TUP-34390)Wrong file selection dialog title for Export custom (#4989)
settings in Modules view
2022-01-25 10:12:15 +08:00
Xilai Dai
01a3801bb0 (APPINT-34208) fix the master branch name issue (#4990) 2022-01-24 13:49:49 +08:00
kjwang
084745f17b Fix TUP-32950 On Ubuntu 18.04.5 documentation comment is displayed as a (#4949) (#4985)
Fix TUP-32950 On Ubuntu 18.04.5 documentation comment is displayed as a black box in Talend Studio designer tab
https://jira.talendforge.org/browse/TUP-32950
2022-01-21 15:03:23 +08:00
Wei Hua
22f73a08de Hwei/bugfix/master/appint 33765 (#4974)
* APPINT-33765 [7.3.1 patch] ClassNotFoundException in runtime when DB connection (SQLServer) in joblet without using alias

* APPINT-33765 [7.3.1 patch] ClassNotFoundException in runtime when DB connection (SQLServer) in joblet without using alias
2022-01-21 10:31:07 +08:00
tsasada-talend
0d18604741 Add localized files (#4980)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-01-20 18:31:52 +08:00
Chao MENG
049b4c7c76 chore: change the url check url (#4972) 2022-01-19 12:00:04 +08:00
Jill Yan
1c6c1341a1 Revert "APPINT-33992 (#4936)" (#4968)
This reverts commit e570c9d476.
2022-01-17 12:10:34 +08:00
zshen-talend
090e598d55 feat(TDQ-19814): create a new component tDataQualityRules (#4943) 2022-01-13 18:19:11 +08:00
zyuan-talend
cff7c53280 fix(TUP-27184):escape label value for javajet. (#4961) (#4963) 2022-01-13 16:56:49 +08:00
hcyi
734759f372 fix(TUP-34020):CVE: org.apache.axis2:axis2-kernel:[1.1-1.8.0] (#4838) 2022-01-12 18:47:56 +08:00
Jill Yan
e570c9d476 APPINT-33992 (#4936)
Co-authored-by: jillyan <yan955599@gmail.com>
2022-01-12 15:57:10 +08:00
zyuan-talend
2a32fb66e6 fix(TUP-27184):copy label from GraphicNode to DataNode. (#4947) (#4952) 2022-01-11 18:46:30 +08:00
Zhiwei Xue
30053f572c feat(TUP-33284):Allow Publishing to cloud only if the job items are (#4916)
committed and pushed to Git
2022-01-11 15:50:31 +08:00
Xilai Dai
048734d3bc Feat/master/appint 34208 (#4950)
* add git info in pom.xml

* (APPINT-34208) add branch name into pom properties

* (APPINT-34208) fix the getting branch name

Co-authored-by: Zhiwei Xue <zwxue@talend.com>
2022-01-11 15:42:43 +08:00
hcyi
0d2f6f19c3 fix(TUP-30975):Can't move Couchbase connection to folder. (#4912) 2022-01-10 10:31:58 +08:00
kjwang
52da1b306e TUP-34282 CVE: log4j-core(1.2-api)-[2-2.16.0) (#4922)
TUP-34282 CVE: log4j-core(1.2-api)-[2-2.16.0)
https://jira.talendforge.org/browse/TUP-34282
2022-01-07 09:41:28 +08:00
jiezhang-tlnd
701d470538 Jzhang/tup 34347 (#4938)
* fix(TUP-34347)DataViewer doesnt work on retrieved schema

* fix(TUP-34347)DataViewer doesnt work on retrieved schema

* fix(TUP-34347)DataViewer doesnt work on retrieved schema
2022-01-06 18:45:42 +08:00
tsasada-talend
521426be77 Add localized files (#4941)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-01-06 18:36:01 +08:00
hzhao-talendbj
ddd4b0eba8 fix(TUP-33644): TMC: error pop up when uncheck "use manual commit mode" (#4939) (#4940)
* fix(TUP-33644): TMC: error pop up when uncheck "use manual commit mode"

* fix(TUP-33644): TMC: error pop up when uncheck "use manual commit mode
2022-01-06 18:16:27 +08:00
cbadillo1603
21d789d553 fix(TBD-12184):Password field missing for tImpalaRow (#4520) (#4926)
* Revert "Revert "fix(TBD-12184):Password field missing for tImpalaRow (#4472)" (#4507)"

This reverts commit f7fb174301.

* fix(TBD-12184):Password field missing for tImpalaRow

* fix(TBD-12184):Password field missing for tImpalaRow

* fix(TBD-12184):Password field missing for tImpalaRow

* fix(TBD-12184):Password field missing for tImpalaRow
2022-01-04 14:18:31 +01:00
Emmanuel GALLOIS
e4faa6a337 feat(TDI-47278): bump component-runtime to 1.40.0 (#4898) 2022-01-04 12:34:14 +01:00
tsasada-talend
ad2f4ce5bb Add localized files (#4921)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-01-04 10:32:08 +08:00
Alexiane Yvonet
38682ffba3 Add localized files (#4920)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-01-04 10:30:44 +08:00
hzhao-talendbj
d895842031 fix(TUP-33962): Error in handling default value as NULL (#4875) (#4919)
* fix(TUP-33962): Error in handling default value as NULL

* fix(TUP-33962): Error in handling default value as NULL

* fix(TUP-33962): Error in handling default value as NULL
2021-12-31 14:33:53 +08:00
Zhiwei Xue
edce94393b workitem(TUP-34111):slow studio build time for remote execution (#4883) 2021-12-30 16:08:15 +08:00
jiezhang-tlnd
0d8066e125 chore(TUP-34021)CVE org.apache.maven maven-core 3.8.1 (#4856) 2021-12-30 14:58:36 +08:00
zyuan-talend
e3bae25dc5 fix(TUP-33214):complement the tree node sorting logic. (#4910) 2021-12-30 11:58:59 +08:00
Jane Ding
0f3dcc9475 fix(TUP-33830):[7.3] ref project compilation error (#4842) (#4915)
* fix(TUP-33830):[7.3] ref project compilation error
https://jira.talendforge.org/browse/TUP-33830

* fix(TUP-33830):[7.3] ref project compilation error
https://jira.talendforge.org/browse/TUP-33830
2021-12-30 09:47:55 +08:00
kjwang
c2d3242772 TUP-34120 Restart studio after install feature will have : "Workbench (#4913)
TUP-34120 Restart studio after install feature will have : "Workbench has not been created yet" in error log
https://jira.talendforge.org/browse/TUP-34120
2021-12-29 17:31:39 +08:00
sbliu
cdf8b89429 chore(TUP-33954) upgrade ant 1.10.9 to 1.10.11 (#4841) 2021-12-28 17:50:25 +08:00
hzhao-talendbj
6b573518e3 fix(TUP-33939): Ubuntu: Cannot close "Quick Tour" (#4904) (#4909)
* fix(TUP-33939): Ubuntu: Cannot close "Quick Tour"

* fix(TUP-33939): Ubuntu: Cannot close "Quick Tour"
2021-12-28 10:24:11 +08:00
hcyi
dbe389353e fix(TUP-33897):Remove username from Studio Cloud Login. (#4863)
* fix(TUP-33897):Remove username from Studio Cloud Login.

* fix(TUP-33897):fix a bug when check connection at the first time.

* fix(TUP-33897):fix a bug when check connection at the first time.
2021-12-27 10:15:40 +08:00
bhe-talendbj
ac2734e7d9 fix(TUP-34155): add dependencies to shade plugin (#4886) 2021-12-21 14:49:03 +08:00
tsasada-talend
f4368af5b9 Add localized files (#4880)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2021-12-17 17:52:43 +08:00
Chao MENG
3cc1fa1152 fix(TUP-34118): Can't use latest dependencies of tcompv0 after installed (#4882)
patch
https://jira.talendforge.org/browse/TUP-34118
2021-12-16 20:50:53 +08:00
Chao MENG
45d0a8342a fix(TUP-34141): can't pull the changes of requiredFeatures.json for (#4877)
local mode
https://jira.talendforge.org/browse/TUP-34141
2021-12-16 18:17:19 +08:00
Chao MENG
ded9ab93a8 fix(TUP-34140): run job with tRunJob failed if user B logon a project that user A installed some features contain routine (#4872)
* fix(TUP-34140): run job with tRunJob failed if user B logon a project
that user A installed some features contain routine
https://jira.talendforge.org/browse/TUP-34140

* fix(TUP-34140): run job with tRunJob failed if user B logon a project
that user A installed some features contain routine
https://jira.talendforge.org/browse/TUP-34140
2021-12-15 22:40:42 +08:00
bhe-talendbj
a30cab74bf fix(TUP-34105): upgrade log4j2 (#4852) (#4862) (#4869)
* fix(TUP-34105): upgrade log4j2 (#4852) (#4862)

* fix(TUP-34105): upgrade log4j2 (#4852)

* fix(TUP-34105): upgrade log4j2

* fix(TUP-34105): fix test case

* fix(TUP-34105): update version

* fix(TUP-34105): update version

* fix(TDI-47241): CVE: log4j-api(core)-[2 - 2.15.0)

* add the miss jar align

* fix(TUP-34105): fix synchronize libs

* fix(TUP-34105): update plugin version

* fix(TUP-34105): update plugin version

* fix(TUP-34105): update bundle version

* fix(TUP-34105): update bundle version

* fix(TUP-34105): update bundle version

Co-authored-by: wwang-talend <wwang@talend.com>

* fix(TUP-34105): upgrade to 2.16.0

Co-authored-by: wwang-talend <wwang@talend.com>

* fix(TUP-34105): do not update bundle timestamp

Co-authored-by: wwang-talend <wwang@talend.com>
2021-12-15 11:44:14 +08:00
Chao MENG
7ed80ccb6d fix(TUP-34118): Can't use latest dependencies of tcompv0 after installed (#4858)
patch
https://jira.talendforge.org/browse/TUP-34118
2021-12-14 18:56:08 +08:00
kjwang
5abaef1ab6 TUP-34096 failed to logon the project, after clicking NO on the patch update restart dialog (#4850) (#4855)
* TUP-34096 failed to logon the project, after clicking NO on the patch
update restart dialog
https://jira.talendforge.org/browse/TUP-34096
2021-12-13 15:41:59 +08:00
hcyi
207564458d feat(TUP-33198):add some junits (#4848) 2021-12-13 10:12:36 +08:00
Zhiwei Xue
d6ff602b18 fix(TUP-32059):Add git info in the jobinfo.properties when building job (#4818)
from CI
2021-12-10 19:02:11 +08:00
Chao MENG
660766115d fix(TUP-33713): Logon popup message in a mess when main project and (#4845)
refer project are on different patch level
https://jira.talendforge.org/browse/TUP-33713
2021-12-09 20:38:54 +08:00
kjwang
dcc1725d40 TUP-33713 Logon popup message in a mess when main project and refer (#4843) (#4844)
project are on different patch level
2021-12-09 18:44:17 +08:00
hcyi
8b17ba86b5 feat(TUP-33198):Support retrieve SAP ADSO service metadata with SAP JCO3 (#4812)
* feat(TUP-33198):Support retrieve SAP ADSO service metadata with SAP JCO3

* feat(TUP-33198):Support retrieve SAP ADSO service metadata with SAP JCO3

* feat(TUP-33198):fix TUP-33952[Bug] Import sap connection without hana
info and drag the node into job as tsapadsoinput, the connection type is
null.

* feat(TUP-33198):Support retrieve SAP ADSO service metadata with SAP JCO3
2021-12-09 16:58:07 +08:00
hzhao-talendbj
a8d50d6ac2 feat(TUP-32064): Build up to date Studio index automatically (#4810) (#4835)
* feat(TUP-32064): Build up to date Studio index automatically (#4810)

* feat(TUP-32064): Build up to date Studio index automatically

* feat(TUP-32064): Build up to date Studio index automatically

* feat(TUP-32064): try remove index folder

* feat(TUP-32064): try use generate-sources

* feat(TUP-32064): Build up to date Studio index automatically

* feat(TUP-32064): Build up to date Studio index automatically

* feat(TUP-32064): Build up to date Studio index automatically

* feat(TUP-32064): Build up to date Studio index automatically

* feat(TUP-32064): Build up to date Studio index automatically

* feat(TUP-32064): Build up to date Studio index automatically

* feat(TUP-32064): Build up to date Studio index automatically

* feat(TUP-32064): change master version to 8.8.8
2021-12-09 11:24:23 +08:00
hzhao-talendbj
19a991a2a1 feat(TUP-22589): Create read-only mode in Studio for restricted GIT (#4828) (#4840) 2021-12-09 11:23:01 +08:00
jiezhang-tlnd
17c865c786 fix(TUP-33728)Migrate studio65 job to 801, miss DB connection (#4824)
* fix(TUP-33728)Migrate studio65 job to 801, miss DB connection

* fix(TUP-33728)Migrate studio65 job to 801, miss DB connection

* fix(TUP-33728)Migrate studio65 job to 801, miss DB connection
2021-12-09 09:26:26 +08:00
kjwang
ebdbfe3e14 TUP-33735 "Hierarchical Mapper" can't show properly when switch git (#4834) (#4837)
TUP-33735 "Hierarchical Mapper" can't show properly when switch git branch
https://jira.talendforge.org/browse/TUP-33735
2021-12-08 18:30:09 +08:00
Emmanuel GALLOIS
8a78da5967 feat(TDI-46838): bump component-runtime to 1.39.2 (#4649) 2021-12-07 09:32:03 +01:00
sbliu
aacfc18a1e fix(TUP-33533) output CRLF for generated bat file. (#4815) 2021-12-03 16:01:06 +08:00
pyzhou
8816a6a5df fix(TDI-47147):tMap TUJ fix (#4817) 2021-12-03 15:33:14 +08:00
bhe-talendbj
38b0a1e7f1 feat(TUP-33718): regenerate index and component index data (#4784)
* feat(TUP-33718): regenerate index and component index data

* feat(TUP-33718): fix load dynamic distributions

* feat(TUP-33718): clone new property

* feat(TUP-33718): load dynamic distribution modules

* feat(TUP-33718): load dynamic distribution modules
2021-12-02 10:26:15 +08:00
Chao MENG
ee74a59bf7 fix(TUP-33121): Talend Studio gives no error if unable to connect to (#4806)
remote GIT repository
https://jira.talendforge.org/browse/TUP-33121
2021-11-29 10:34:46 +08:00
jiezhang-tlnd
e6641a1a75 fix(TUP-33728)Migrate studio65 job to 801 miss DB connection (#4780)
* fix(TUP-33728)Migrate studio65 job to 801 miss DB connection
https://jira.talendforge.org/browse/TUP-33728

* fix(TUP-33728)Migrate studio65 job to 801 miss DB connection

* format code

* format code
2021-11-25 18:59:20 +08:00
Chao MENG
92dce3e830 chore: fix switching branch npe (#4778) 2021-11-25 17:44:05 +08:00
sbliu
f75dea2269 fix(TUP-33497) Bug in tDBOutput component when linking rejects to tMap. (#4772) 2021-11-24 17:11:26 +08:00
Zhiwei Xue
f5d22f35e3 feat(TUP-26972):Prompt to Automatically push changes to Remote Branch (#4790) 2021-11-23 18:23:42 +08:00
jiezhang-tlnd
8cfb0ed774 fix(TUP-33412)CVE commons-codec-1.11 (#4800)
* fix(TUP-33412)CVE commons-codec-1.11

* test exclude

* remove

* add exclude to crypto-utils

* add exclude
2021-11-23 16:22:09 +08:00
bhe-talendbj
c8f1376046 fix(TUP-33854): fix exitdata (#4797) 2021-11-22 18:20:39 +08:00
Jane Ding
d1efe710ab fix(TUP-33709):"Failed to create assembly" when compile a BD job with (#4783)
studio commandline
https://jira.talendforge.org/browse/TUP-33709
2021-11-22 17:36:08 +08:00
Xilai Dai
e7926678ba (APPINT-34059) fix the following artifacts could not be resolved: org.codehaus.plexus:plexus-utils:jar:3.3.0 (#4792) 2021-11-22 11:08:10 +08:00
kjwang
4941aa01d3 TUP-33735 "Hierarchical Mapper" can't show properly when switch git (#4785)
TUP-33735 "Hierarchical Mapper" can't show properly when switch git branch
https://jira.talendforge.org/browse/TUP-33735
2021-11-22 10:33:03 +08:00
Zhiwei Xue
449cb87534 fix(TUP-33791):Error pops up while running job in main project and it (#4782)
call childjob from reference project_Migrate
2021-11-19 17:27:43 +08:00
Wei Hua
acf681c18e APPINT-32136 Job & Run view displays DI job icon and/or label when a route or routelet editor is active (#4781)
- Add routelet icon
2021-11-19 11:47:59 +08:00
nrousseau
9618ced9f1 chore(TUP-33832): update version 2021-11-18 10:34:01 +08:00
build-talend
1f1878e225 Set version to 8.8.8 SNAPSHOT (#4786)
Co-authored-by: Jenkins Continuous Build server <jenkins@tal-rd02.talend.lan>
2021-11-16 14:48:25 +01:00
bhe-talendbj
e703c00806 fix(TUP-33659): remove show starting page (#4763) 2021-11-16 15:11:03 +08:00
jiezhang-tlnd
5e7db6dc90 chore(TUP-33412)CVE commons-codec-1.11 (#4740)
* chore(TUP-33412)CVE commons-codec-1.11

* test patch
2021-11-16 14:57:28 +08:00
wang wei
2e7b0d4fbc fix(TDI-46962): tAmazonAuoraOutput compilation errors (#4761) 2021-11-16 10:06:03 +08:00
jiezhang-tlnd
c6029fd39a chore(TUP-33498)CVE Oauth 2.0 SDK with OpenID Connect extensions in (#4743)
Studio
2021-11-15 17:40:41 +08:00
pyzhou
08c68b5348 fix(TDI-46992): ResumeUtil throw BufferOverflowException (#4771)
* fix(TDI-46992): ResumeUtil throw BufferOverflowException

* replace variable
2021-11-12 09:56:22 +08:00
Jane Ding
98a8940a07 fix(TUP-33617):java.io.OptionalDataException on tAvroInput (#4775)
* fix(TUP-33617):java.io.OptionalDataException on tAvroInput
https://jira.talendforge.org/browse/TUP-33617

* fix(TUP-33617):java.io.OptionalDataException on tAvroInput
https://jira.talendforge.org/browse/TUP-33617
2021-11-10 11:39:21 +08:00
kjwang
207f21deb8 TUP-22780 Icons under repository broken during switch to branch, and NPE (#4748)
* TUP-22780 Icons under repository broken during switch to branch, and NPE
pop up
https://jira.talendforge.org/browse/TUP-22780

* TUP-22780 Icons under repository broken during switch to branch, and NPE
pop up
https://jira.talendforge.org/browse/TUP-22780
2021-11-09 19:26:55 +08:00
jiezhang-tlnd
1847f091f2 fix(TUP-33627)[Linux aarch64] License agreement panel and introduction (#4768)
* fix(TUP-33627)[Linux aarch64] License agreement panel and introduction
are blank
https://jira.talendforge.org/browse/TUP-33627

* fix(TUP-33627)[Linux aarch64] License agreement panel and introduction
are blank

* [Linux aarch64] License agreement panel and introduction are blank
2021-11-05 20:03:45 +08:00
hcyi
4b7ec41eb8 fix(TUP-33642):Studio without update settings do not give any infor/warning when logon a monthly migrated project. (#4766)
* fix(TUP-33642):Studio without update settings do not give any
infor/warning when logon
a monthly migrated project.

* fix(TUP-33642):Studio without update settings do not give any
infor/warning when logon a monthly migrated project.
2021-11-04 22:11:28 +08:00
Jane Ding
6fd204630b fix(TUP-33385):Error pops up while logging on migrated project if the (#4752)
project which exported from monthly patch studio>Studio
https://jira.talendforge.org/browse/TUP-33385
2021-11-04 19:45:14 +08:00
bhe-talendbj
eae9fafb43 fix(TUP-33414): [bug] JETL: Studio is closed after patch installed (#4744)
* fix(TUP-33414): fix restart params

* fix(TUP-33414): revert unintentional changes

* fix(TUP-33414): revert unintentional changes

* fix(TUP-33414): revert unintentional changes

* fix(TUP-33414): fix exit data

* fix(TUP-33414): change only for jetl and windows

* fix(TUP-33414): change only for jetl and windows

* fix(TUP-33414): change only for jetl and windows

* fix(TUP-33414): change only for jetl and windows

* fix(TUP-33414): add logs

* fix(TUP-33414): add logs
2021-11-04 18:41:19 +08:00
jiezhang-tlnd
954a681095 Jzhang/tup 33651 (#4760)
* feat(TUP-33651)Remove the old download action
https://jira.talendforge.org/browse/TUP-33651

* remove the icon
2021-11-04 15:13:11 +08:00
sbouyer
6e850c80ce Add localized files (#4751)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2021-11-04 10:19:50 +08:00
Alexiane Yvonet
643b2805fe Add localized files (#4731)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2021-11-04 10:18:56 +08:00
tsasada-talend
4e8d2cca45 Add localized files (#4732)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2021-11-04 10:08:48 +08:00
Jane Ding
c266fc498f feat(TUP-33421):Send Studio login information to Pendo (#4726)
* feat(TUP-33421):Send Studio login information to Pendo
https://jira.talendforge.org/browse/TUP-33421

* feat(TUP-33421):Send Studio login information to Pendo
https://jira.talendforge.org/browse/TUP-33421

* feat(TUP-33421):Send Studio login information to Pendo
https://jira.talendforge.org/browse/TUP-33421

* feat(TUP-33421):Send Studio login information to Pendo
https://jira.talendforge.org/browse/TUP-33421

* feat(TUP-33421):Send Studio login information to Pendo
https://jira.talendforge.org/browse/TUP-33421

* feat(TUP-33421):Send Studio login information to Pendo
https://jira.talendforge.org/browse/TUP-33421

* feat(TUP-33421):Send Studio login information to Pendo
https://jira.talendforge.org/browse/TUP-33421
2021-11-03 17:52:38 +08:00
Liu Xinquan
bca165e700 fix(TDQ-19753) TOS_DQ failed to fetch sqlexplorer.jar and chart.jar (#4733) 2021-11-01 17:52:09 +08:00
kjwang
a860bf9a64 Fix TUP-33607 Show tooltip on the warning icon of "Find features needed (#4738)
Fix TUP-33607 Show tooltip on the warning icon of "Find features needed for import"
https://jira.talendforge.org/browse/TUP-33607
2021-11-01 16:22:44 +08:00
Zhiwei Xue
3e3c225b0d fix(TUP-33317):deactivate TDM features get errors in error log and DQ (#4727)
refresh get error dialog
2021-11-01 16:21:21 +08:00
nrousseau
c5167fd103 fix(TUP-33595): SLF4J not working in Studio 8 (#4737) 2021-11-01 09:22:12 +08:00
bhe-talendbj
193081f7b1 fix(TUP-33594): No studio version when start studio / commandline in the logs (#4729)
* fix(TUP-33594): print out product version

* fix(TUP-33594): add javax.servlet

* fix(TUP-33594): revert unnecessary changes
2021-10-30 20:05:43 +08:00
pyzhou
3a5becf258 fix(TDI-46937): fix tmap tuj (#4723)
* fix(TDI-46937): fix tmap tuj

* fix(TDI-46937):fix tuj
2021-10-29 16:38:53 +08:00
sbliu
ebc9394c27 feat(TUP-33462) Removal / deprecate of DB versions linked to DI components. (#4710)
align vertica, Vertica db versions and remove remove db interbase, ingres, Vectorwise, ParAccel.
2021-10-29 16:30:41 +08:00
zyuan-talend
0ba186ba76 fix(TUP-33432):show the dropdown list when click on "Support" button. (#4722) 2021-10-28 15:45:41 +08:00
hzhao-talendbj
d2f1898a4c fix(TUP-33485): [tELTMap] Delimited identifiers does not work for (#4719)
Snowflake
2021-10-27 17:43:10 +08:00
bhe-talendbj
b98af59baf chore(TUP-33502): change logs (#4717) 2021-10-27 15:28:37 +08:00
jiezhang-tlnd
fc4197206a fix(TUP-33312)CWE-327: upgrade bcprov-jdk15on to 1.69 (#4674) 2021-10-27 11:30:07 +08:00
Nicolas Rousseau
d7968d7ec2 fix(TUP-33546): fix arm issue on mac 2021-10-26 20:09:55 +08:00
Zhiwei Xue
bdc31e6a13 feat(TUP-33307):change version display in dialog (#4714) 2021-10-26 11:05:54 +08:00
pyzhou
7e4800e33a fix(TDI-46923):add back jboss marshalling (#4711) 2021-10-25 15:06:55 +08:00
kjwang
a6aa7f4874 TUP-33396 [bug]better disable button "Install and restart" button if no (#4709)
feature selected (Improve the tooltip)
2021-10-22 18:20:45 +08:00
kjwang
30150e7851 TUP-33396 [bug]better disable button "Install and restart" button if no (#4707)
feature selected (Improve the tooltip)
2021-10-22 18:10:10 +08:00
438 changed files with 8914 additions and 1451 deletions

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.commons.feature" label="Commons Feature" version="8.0.1.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.commons.feature" label="Commons Feature" version="8.8.8.qualifier" provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#commons-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#commons-feature</description>
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
<license>The licence are describe in branding feature</license>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.core.feature" label="Core Feature" version="8.0.1.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.core.feature" label="Core Feature" version="8.8.8.qualifier" provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#core-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#core-feature</description>
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
<license>The licence are describe in branding feature</license>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.fragment.jars.common.feature"
label="Fragment Jars in Common"
version="8.0.1.qualifier">
version="8.8.8.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]
@@ -54,7 +54,13 @@
id="org.talend.libraries.apache.lucene8"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.talend.signon.util"
download-size="0"
install-size="0"
version="0.0.0"
unpack="true"/>
unpack="false"/>
</feature>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.fragment.jars.common.feature</artifactId>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.help.feature" label="Help Feature" version="8.0.1.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.help.feature" label="Help Feature" version="8.8.8.qualifier" provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#help-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#help-feature</description>
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
<license>The licence are describe in branding feature</license>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.help.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="8.0.1.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="8.8.8.qualifier" provider-name=".Talend SA.">
<description url="http://www.example.com/description">[Enter Feature Description here.]</description>
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
<license url="http://www.example.com/license">[Enter License Description here.]</license>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.platform.feature"
label="Platform featrue"
version="8.0.1.qualifier"
version="8.8.8.qualifier"
provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#platform-feature">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.platform.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.rcp.feature"
label="RCP Feature"
version="8.0.1.qualifier"
version="8.8.8.qualifier"
provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#rcp-feature">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.update.p2.feature" label="P2-feature" version="8.0.1.qualifier">
<feature id="org.talend.update.p2.feature" label="P2-feature" version="8.8.8.qualifier">
<description url="http://www.example.com/description">[Enter Feature Description here.]</description>
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
<license url="http://www.example.com/license">[Enter License Description here.]</license>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.update.p2.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.updates.feature" label="Updates-feature" version="8.0.1.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.updates.feature" label="Updates-feature" version="8.8.8.qualifier" provider-name=".Talend SA.">
<copyright url="http://www.talend.com/about-us">[Enter Copyright Description here.]</copyright>
<plugin id="org.talend.updates.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
</feature>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.updates.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="8.0.1.qualifier">
<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="8.8.8.qualifier">
<description url="http://www.example.com/description">This feature contains the Talend utilities plugin and its dependencies.</description>
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
<license url="http://www.example.com/license">[Enter License Description here.]</license>
@@ -21,11 +21,11 @@
<import plugin="org.junit" version="4.13.2" match="greaterOrEqual"/>
<import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.slf4j.binding.log4j12" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.talend.studio.studio-utils" version="0.0.0" match="greaterOrEqual"/>
</requires>
<plugin id="org.talend.daikon" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.daikon.exception" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.daikon.crypto.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.studio.studio-utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.platform.logging" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
</feature>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.utils.feature</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Common UI runtime Plug-in
Bundle-SymbolicName: org.talend.common.ui.runtime;singleton:=true
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.8.8.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.apache.commons.collections,
org.talend.libraries.dom4j-jaxen,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.common.ui.runtime</artifactId>

View File

@@ -72,12 +72,27 @@ public final class MessageBoxExceptionHandler {
}
}
public static void process(Throwable ex, Shell shell, boolean wrapMessage) {
CommonExceptionHandler.process(ex);
if (CommonsPlugin.isHeadless() || CommonsPlugin.isJUnitTest()) {
return;
}
if (shell != null) {
showMessage(ex, shell, wrapMessage);
}
}
public static void showMessage(Throwable ex, Shell shell) {
showMessage(ex, shell, true);
}
/**
* Open a message box showing a generic message and exception message.
*
* @param ex - exception to show
*/
public static void showMessage(Throwable ex, Shell shell) {
public static void showMessage(Throwable ex, Shell shell, boolean wrapMessage) {
if (ex.equals(lastShowedAction)) {
return;
}
@@ -85,10 +100,14 @@ public final class MessageBoxExceptionHandler {
// TODO smallet use ErrorDialogWidthDetailArea ?
String title = Messages.getString("commons.error"); //$NON-NLS-1$
String msg = Messages.getString("exception.errorOccured", ex.getMessage()); //$NON-NLS-1$
String excepMsg = ex.getMessage();
//add for tup-19726/19790, as for exception detailMessage will show more details on log area.
if(ex.getCause()!=null) {
msg = Messages.getString("exception.errorOccured", ex.getCause().getMessage()); //$NON-NLS-1$
excepMsg = ex.getCause().getMessage();
}
String msg = Messages.getString("exception.errorOccured", excepMsg); //$NON-NLS-1$
if (!wrapMessage) {
msg = Messages.getString("exception.message", excepMsg); //$NON-NLS-1$
}
Priority priority = CommonExceptionHandler.getPriority(ex);

View File

@@ -114,6 +114,7 @@ TableViewerCreator.Table.BeNull=table is null
TableViewerCreator.TableColumn.AssertMsg=The TableColumn of TableEditorColumn with idProperty '{0}' has not the correct Table parent
TreeToTablesLinker.Type.Unsupported=This type of currentControl is unsupported
commons.error=Error
exception.message={0}\nSee log for more details.
exception.errorOccured=An error occured ({0}).\nSee log for more details.
ModelSelectionDialog.Message=Please choose one option, or cancel.
ModelSelectionDialog.Option=option

View File

@@ -114,6 +114,7 @@ TableViewerCreator.Table.BeNull=\u30C6\u30FC\u30D6\u30EB\u304CNULL\u3067\u3059
TableViewerCreator.TableColumn.AssertMsg=idProperty'{0}'\u304C\u3042\u308BTableEditorColumn\u306ETableColumn\u306B\u306F\u3001\u6B63\u3057\u3044\u89AA\u30C6\u30FC\u30D6\u30EB\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093
TreeToTablesLinker.Type.Unsupported=currentControl\u306E\u3053\u306E\u30BF\u30A4\u30D7\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
commons.error=\u30A8\u30E9\u30FC
exception.message={0}\n\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
exception.errorOccured=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F({0})\u3002\n\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
ModelSelectionDialog.Message=\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\uFF11\u3064\u9078\u629E\u3059\u308B\u304B\u3001\u30AD\u30E3\u30F3\u30BB\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002
ModelSelectionDialog.Option=\u30AA\u30D7\u30B7\u30E7\u30F3

View File

@@ -16,8 +16,14 @@ import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
@@ -158,8 +164,35 @@ public class ImageUtils {
return imageDes;
}
private static Map<byte[], ImageDataProvider> imageFromDataCachedImages = new HashMap<byte[], ImageDataProvider>();
private static Map<byte[], ImageDataProvider> imageFromDataCachedImages = Collections.synchronizedMap(new HashMap<byte[], ImageDataProvider>());
private static Map<Long, byte[]> cachedImagesTimeKeeping = Collections.synchronizedMap(new HashMap<Long, byte[]>());
private static Thread clearImageFromDataCachedImages = new Thread() {
@SuppressWarnings("static-access")
public void run() {
long timeout = 5 * 60 * 1000;
while(true) {//remove older than 5 mins
Set<Entry<Long, byte[]>> collect = cachedImagesTimeKeeping.entrySet().stream()
.filter(entry -> (System.currentTimeMillis() - entry.getKey()) > timeout).collect(Collectors.toSet());
for(Entry<Long, byte[]> entry: collect) {
Long key = entry.getKey();
cachedImagesTimeKeeping.remove(key);
imageFromDataCachedImages.remove(entry.getValue());
}
try {
sleep(timeout);
} catch (InterruptedException e) {//
}
}
};
};
static {
clearImageFromDataCachedImages.setDaemon(true);
clearImageFromDataCachedImages.start();
}
/**
* By default, keep in memory the .
*
@@ -169,12 +202,17 @@ public class ImageUtils {
*/
public static ImageDescriptor createImageFromData(byte[] data, boolean... keepInMemory) {
if (data != null) {
ImageDataProvider imageProvider = imageFromDataCachedImages.get(data);
ImageDataProvider imageProvider = null;
Optional<byte[]> findKey = imageFromDataCachedImages.keySet().stream().filter(key->Arrays.equals(key, data)).findAny();
if(findKey.isPresent()) {
imageProvider = imageFromDataCachedImages.get(findKey.get());
}
if (imageProvider == null) {
ByteArrayInputStream bais = new ByteArrayInputStream(data);
ImageData img = new ImageData(bais);
imageProvider = new TalendImageProvider(img);
imageFromDataCachedImages.put(data, imageProvider);
cachedImagesTimeKeeping.put(System.currentTimeMillis(), data);
}
return ImageDescriptor.createFromImageDataProvider(imageProvider);
}
@@ -183,8 +221,9 @@ public class ImageUtils {
public static void disposeImages(byte[] data) {
if (data != null) {
if (imageFromDataCachedImages.get(data) != null) {
imageFromDataCachedImages.remove(data);
Optional<byte[]> findKey = imageFromDataCachedImages.keySet().stream().filter(key->Arrays.equals(key, data)).findAny();
if(findKey.isPresent()) {
imageFromDataCachedImages.remove(findKey.get());
}
}
}

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Common Runtime Plug-in
Bundle-SymbolicName: org.talend.commons.runtime;singleton:=true
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.8.8.qualifier
Require-Bundle: org.apache.log4j;visibility:=reexport,
org.apache.commons.commons-beanutils,
org.apache.commons.collections,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.runtime</artifactId>

View File

@@ -52,6 +52,10 @@ public final class CommonExceptionHandler {
log.log(Level.WARN, message);
}
public static void error(String message) {
log.log(Level.ERROR, message);
}
/**
* Return priority corresponding to the exception implementation.
*

View File

@@ -88,13 +88,17 @@ public class EclipseCommandLine {
static public final String TALEND_CONTINUE_LOGON = "-talendContinueLogon";
static public final String TALEND_CONTINUE_UPDATE = "-talendContinueUpdate";
static public final String TALEND_CLEAN_M2 = "-talendCleanM2";
static public final String TALEND_CLEAN_UNINSTALLED_BUNDLES = "-talendCleanUninstalledBundles";
static public final String PROP_KEY_PROFILE_ID = "eclipse.p2.profile";
static public final String ARG_BRANCH = "-branch";
static public final String ARG_PROJECT = "-project";
static public final String LOGIN_ONLINE_UPDATE = "--loginOnlineUpdate";
static public final String ARG_TALEND_BUNDLES_CLEANED = "-talend.studio.bundles.cleaned"; //$NON-NLS-1$

View File

@@ -1 +1 @@
talend.version=8.0.1
talend.version=8.8.8

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Common UI Plug-in
Bundle-SymbolicName: org.talend.commons.ui;singleton:=true
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.8.8.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.jface.text,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.ui</artifactId>

View File

@@ -3,7 +3,7 @@ Automatic-Module-Name: org.talend.core.repository
Bundle-ManifestVersion: 2
Bundle-Name: Core Repository Plug-in
Bundle-SymbolicName: org.talend.core.repository;singleton:=true
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.8.8.qualifier
Require-Bundle: org.eclipse.ui,
org.eclipse.ui.ide,
org.apache.commons.collections,
@@ -15,6 +15,7 @@ Require-Bundle: org.eclipse.ui,
org.talend.libraries.apache,
org.eclipse.osgi.services,
org.eclipse.ui.navigator,
org.eclipse.e4.ui.css.swt.theme,
org.talend.libraries.jackson
Export-Package: org.talend.core.repository,
org.talend.core.repository.constants,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.repository</artifactId>

View File

@@ -39,6 +39,18 @@ public final class Constant {
*/
public static final String ITEM_EVENT_PROPERTY_KEY = "item"; //$NON-NLS-1$
/**
* key used to get/set the property of an event related to an item (REPOSITORY_ITEM_EVENT_PREFIX). The value is the
* cloudVersion string.
*/
public static final String VERSION_EVENT_CLOUD_KEY = "cloudVersion"; //$NON-NLS-1$
/**
* key used to get/set the property of an event related to an item (REPOSITORY_ITEM_EVENT_PREFIX). The value is the
* cloudName string.
*/
public static final String VERSION_EVENT_CLOUD_NAME = "cloudName"; //$NON-NLS-1$
/**
* key used to get/set the property of an event related to a list of files modified in the repository
* (REPOSITORY_ITEM_EVENT_PREFIX). The value is the Collection of String (list of all files modified).
@@ -62,4 +74,9 @@ public final class Constant {
* (REPOSITORY_ITEM_EVENT_PREFIX). The value is the Collection of String (list of all files modified).
*/
public static final String PROJECT_RELOAD_PROPERTY_KEY = "project"; //$NON-NLS-1$
/**
* suffix used when issuing an event on the OSGI event bus when published to cloud.
*/
public static final String CLOUD_PUBLISH_EVENT_SUFFIX = "cloud"; //$NON-NLS-1$
}

View File

@@ -19,6 +19,8 @@ import org.talend.repository.model.RepositoryConstants;
*/
public interface FileConstants {
String DOT = ".";
String OLD_TALEND_PROJECT_FILENAME = "talendProject"; //$NON-NLS-1$
String LOCAL_PROJECT_FILENAME = "talend.project"; //$NON-NLS-1$
@@ -112,5 +114,4 @@ public interface FileConstants {
String TALEND_FOLDER_NAME = "TALEND-INF"; //$NON-NLS-1$
String MAVEN_FOLDER_NAME = "MAVEN-INF";
}

View File

@@ -0,0 +1,280 @@
// ============================================================================
//
// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.core.repository.model;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Level;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.core.ICoreService;
import org.talend.core.PluginChecker;
import org.talend.core.model.properties.Property;
import org.talend.core.model.properties.RoutineItem;
import org.talend.core.model.properties.SQLPatternItem;
import org.talend.core.model.repository.ERepositoryObjectType;
import org.talend.core.model.repository.IRepositoryViewObject;
import org.talend.core.pendo.PendoItemSignatureUtil;
import org.talend.core.pendo.PendoItemSignatureUtil.SignatureStatus;
import org.talend.core.pendo.PendoItemSignatureUtil.TOSProdNameEnum;
import org.talend.core.pendo.PendoItemSignatureUtil.ValueEnum;
import org.talend.core.pendo.PendoTrackDataUtil;
import org.talend.core.pendo.PendoTrackDataUtil.TrackEvent;
import org.talend.core.pendo.PendoTrackSender;
import org.talend.core.pendo.properties.PendoSignLogonProperties;
import org.talend.utils.migration.MigrationTokenUtil;
/**
* DOC jding class global comment. Detailled comment
*/
public class PendoItemSignatureManager {
private PendoSignLogonProperties itemSignProperties = new PendoSignLogonProperties();
private static PendoItemSignatureManager manager;
private static boolean isTrackAvailable;
static {
manager = new PendoItemSignatureManager();
try {
isTrackAvailable = PluginChecker.isTIS() && PendoTrackSender.getInstance().isTrackSendAvailable();
} catch (Exception e) {
ExceptionHandler.process(e, Level.WARN);
}
}
private PendoItemSignatureManager() {
}
public static PendoItemSignatureManager getInstance() {
return manager;
}
private Set<String> signByLoginMigrationItems = new HashSet<String>();
public void countItemSignByMigration(String file) {
if (!isTrackAvailable) {
return;
}
if (!ProxyRepositoryFactory.getInstance().isFullLogonFinished()) {
signByLoginMigrationItems.add(file);
}
}
public void collectProperties() {
ICoreService coreService = ICoreService.get();
if (coreService == null || !isTrackAvailable) {
return;
}
try {
itemSignProperties.setSignByMigration(signByLoginMigrationItems.size());
String seperator = "@";
Map<String, Integer> tosUnsignItemMap = new HashMap<String, Integer>();
Map<String, Integer> invalidItemVersionMap = new HashMap<String, Integer>();
Set<String> checkedItem = new HashSet<String>();
ProxyRepositoryFactory proxyRepositoryFactory = ProxyRepositoryFactory.getInstance();
ERepositoryObjectType[] types = (ERepositoryObjectType[]) ERepositoryObjectType.values();
for (ERepositoryObjectType type : types) {
List<IRepositoryViewObject> allObjectList = proxyRepositoryFactory.getAll(type);
for (IRepositoryViewObject repositoryObject : allObjectList) {
Property property = repositoryObject.getProperty();
if (property == null || property.eResource() == null) {
continue;
}
String itemKey = repositoryObject.getRepositoryObjectType() + seperator + property.getId() + seperator
+ property.getVersion();
if (isBuiltInItem(repositoryObject) || checkedItem.contains(itemKey)) {
continue;
}
checkedItem.add(itemKey);
Integer verifyResult = null;
try {
verifyResult = coreService.getSignatureVerifyResult(property, null, false);
if (verifyResult != null) {
switch (verifyResult) {
case SignatureStatus.V_VALID:
itemSignProperties.setValidItems(itemSignProperties.getValidItems() + 1);
break;
case SignatureStatus.V_UNSIGNED:
String itemProductName = PendoItemSignatureUtil
.getItemProductName(property);
if (StringUtils.isNotBlank(itemProductName)) {
String tosCategory = TOSProdNameEnum.getTOSCategoryByProdName(itemProductName);
if (StringUtils.isBlank(tosCategory)) {
itemSignProperties.setUnsignEEItems(itemSignProperties.getUnsignEEItems() + 1);
} else {
if (tosUnsignItemMap.get(tosCategory) == null) {
tosUnsignItemMap.put(tosCategory, 0);
}
tosUnsignItemMap.put(tosCategory, tosUnsignItemMap.get(tosCategory) + 1);
}
}
addInvalidItemVersion(property, invalidItemVersionMap);
break;
default:
addInvalidItemVersion(property, invalidItemVersionMap);
itemSignProperties.setInvalidSignItems(itemSignProperties.getInvalidSignItems() + 1);
}
}
} catch (Exception e) {
ExceptionHandler.process(e, Level.WARN);
if (verifyResult == null) {
// exception during verify
addInvalidItemVersion(property, invalidItemVersionMap);
itemSignProperties.setInvalidSignItems(itemSignProperties.getInvalidSignItems() + 1);
}
}
}
}
itemSignProperties.setInvalidItemSourceVersion(getSortInvalidItems(invalidItemVersionMap));
itemSignProperties.setUnsignSEItems(getSortTOSUnsignItems(tosUnsignItemMap));
itemSignProperties.setStudioVersion(PendoItemSignatureUtil.getStudioVersion());
if (coreService.isInValidGP()) {
itemSignProperties.setGracePeriod(ValueEnum.YES.getDisplayValue());
} else {
itemSignProperties.setGracePeriod(ValueEnum.NO.getDisplayValue());
}
String prodDate = PendoItemSignatureUtil.formatDate(System.getProperty(PendoItemSignatureUtil.PROD_DATE_ID),
"yyyy-MM-dd");
itemSignProperties.setInstallDate(prodDate);
String projectCreateDate = PendoItemSignatureUtil.getCurrentProjectCreateDate();
itemSignProperties.setProjectCreateDate(PendoItemSignatureUtil.formatDate(projectCreateDate, "yyyy-MM-dd"));
String value = System.getProperty(PendoItemSignatureUtil.MIGRATION_TOKEN_KEY);
Map<String, Date> tokenTime = MigrationTokenUtil.getMigrationTokenTime(value);
if (tokenTime == null || tokenTime.isEmpty()) {
itemSignProperties.setValidMigrationToken(ValueEnum.NOT_APPLICATE.getDisplayValue());
} else {
String customer = coreService.getLicenseCustomer();
Date tokenDate = tokenTime.get(customer);
Date currentDate = new Date();
if (tokenDate != null && tokenDate.after(currentDate)) {
itemSignProperties.setValidMigrationToken(ValueEnum.YES.getDisplayValue());
} else {
itemSignProperties.setValidMigrationToken(ValueEnum.NO.getDisplayValue());
}
}
} catch (Exception e) {
ExceptionHandler.process(e, Level.WARN);
}
}
private void addInvalidItemVersion(Property property, Map<String, Integer> invalidItemVersionMap) {
String itemProductVersion = PendoItemSignatureUtil.getItemProductVersion(property);
if (StringUtils.isNotBlank(itemProductVersion)) {
if (invalidItemVersionMap.get(itemProductVersion) == null) {
invalidItemVersionMap.put(itemProductVersion, 0);
}
invalidItemVersionMap.put(itemProductVersion, invalidItemVersionMap.get(itemProductVersion) + 1);
}
}
private boolean isBuiltInItem(IRepositoryViewObject repositoryObject) {
if (repositoryObject.getProperty().getItem() instanceof SQLPatternItem) {
SQLPatternItem sqlPatternItem = (SQLPatternItem) repositoryObject.getProperty().getItem();
if (sqlPatternItem.isSystem()) {
return true;
}
}
if (repositoryObject.getProperty().getItem() instanceof RoutineItem) {
RoutineItem routineItem = (RoutineItem) repositoryObject.getProperty().getItem();
if (routineItem.isBuiltIn()) {
return true;
}
}
return false;
}
private String getSortTOSUnsignItems(Map<String, Integer> tosUnsignItemMap) {
List<Map.Entry<String, Integer>> resultMapList = new ArrayList<Map.Entry<String, Integer>>(tosUnsignItemMap.entrySet());
Collections.sort(resultMapList, new Comparator<Map.Entry<String, Integer>>() {
@Override
public int compare(Entry<String, Integer> o1, Entry<String, Integer> o2) {
List<TOSProdNameEnum> categoryList = Arrays.asList(TOSProdNameEnum.values());
TOSProdNameEnum category1 = TOSProdNameEnum.valueOf(o1.getKey());
TOSProdNameEnum category2 = TOSProdNameEnum.valueOf(o2.getKey());
return categoryList.indexOf(category1) - categoryList.indexOf(category2);
}
});
Map<String, Integer> tosUnsignMap = new LinkedHashMap<String, Integer>();
resultMapList.forEach(entry -> {
tosUnsignMap.put(entry.getKey(), entry.getValue());
});
return PendoTrackDataUtil.convertEntityJsonString(tosUnsignMap);
}
private String getSortInvalidItems(Map<String, Integer> invalidItemVersionMap) {
List<Map.Entry<String, Integer>> resultMapList = new ArrayList<Map.Entry<String, Integer>>(
invalidItemVersionMap.entrySet());
Collections.sort(resultMapList, new Comparator<Map.Entry<String, Integer>>(){
@Override
public int compare(Entry<String, Integer> o1, Entry<String, Integer> o2) {
return o1.getKey().compareTo(o2.getKey());
}
});
Map<String, Integer> invalidMap = new LinkedHashMap<String, Integer>();
resultMapList.forEach(entry -> {
invalidMap.put(entry.getKey(), entry.getValue());
});
return PendoTrackDataUtil.convertEntityJsonString(invalidMap);
}
public void sendTrackToPendo() {
if (!isTrackAvailable) {
return;
}
Job job = new Job("send pendo track") {
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
collectProperties();
PendoTrackSender.getInstance().sendTrackData(TrackEvent.ITEM_SIGNATURE, itemSignProperties);
} catch (Exception e) {
// warning only
ExceptionHandler.process(e, Level.WARN);
}
return Status.OK_STATUS;
}
};
job.setUser(false);
job.setPriority(Job.INTERACTIVE);
job.schedule();
}
}

View File

@@ -2319,6 +2319,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
if (monitor != null && monitor.isCanceled()) {
throw new OperationCanceledException(""); //$NON-NLS-1$
}
PendoItemSignatureManager.getInstance().sendTrackToPendo();
boolean isCommandLineLocalRefProject = false;
CommandLineContext commandLineContext = (CommandLineContext) CoreRuntimePlugin.getInstance().getContext()

View File

@@ -1,125 +1,127 @@
// ============================================================================
//
// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.core.repository.model;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.ArrayUtils;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.swt.events.SelectionListener;
import org.talend.commons.ui.runtime.exception.ExceptionHandler;
import org.talend.commons.utils.workbench.extensions.ExtensionImplementationProvider;
import org.talend.commons.utils.workbench.extensions.ExtensionPointLimiterImpl;
import org.talend.commons.utils.workbench.extensions.IExtensionPointLimiter;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.ui.branding.IBrandingService;
/**
* Provides, using extension points, implementation of many factories.
*
* <ul>
* <li>IProcessFactory</li>
* </ul>
*
* $Id: RepositoryFactoryProvider.java 38013 2010-03-05 14:21:59Z mhirt $
*/
public class RepositoryFactoryProvider {
private static List<IRepositoryFactory> list = null;
public static final IExtensionPointLimiter REPOSITORY_PROVIDER = new ExtensionPointLimiterImpl(
"org.talend.core.repository.repository_provider", //$NON-NLS-1$
"RepositoryFactory", 1, -1); //$NON-NLS-1$
public static List<IRepositoryFactory> getAvailableRepositories() {
if (list == null) {
list = new ArrayList<IRepositoryFactory>();
List<IConfigurationElement> extension = ExtensionImplementationProvider.getInstanceV2(REPOSITORY_PROVIDER);
String hiddenRepos = System.getProperty("hidden.repositories"); //$NON-NLS-1$
String hiddenRepository[] = new String[]{};
if (hiddenRepos != null) {
hiddenRepository = hiddenRepos.split(";"); //$NON-NLS-1$
}
boolean isPoweredByTalend = false;
IBrandingService brandingService = (IBrandingService) GlobalServiceRegister.getDefault()
.getService(IBrandingService.class);
isPoweredByTalend = brandingService.isPoweredbyTalend();
for (IConfigurationElement current : extension) {
try {
String only4TalendStr = current.getAttribute("only4Talend"); //$NON-NLS-1$
if (Boolean.valueOf(only4TalendStr) && !isPoweredByTalend) {
continue;
}
String only4OemStr = current.getAttribute("only4Oem"); //$NON-NLS-1$
if (Boolean.valueOf(only4OemStr) && isPoweredByTalend) {
continue;
}
IRepositoryFactory currentAction = (IRepositoryFactory) current.createExecutableExtension("class"); //$NON-NLS-1$
currentAction.setId(current.getAttribute("id")); //$NON-NLS-1$
currentAction.setName(current.getAttribute("name")); //$NON-NLS-1$
currentAction.setAuthenticationNeeded(new Boolean(current.getAttribute("authenticationNeeded"))); //$NON-NLS-1$
currentAction.setDisplayToUser(new Boolean(current.getAttribute("displayToUser")).booleanValue()); //$NON-NLS-1$
// Getting dynamic login fields:
for (IConfigurationElement currentLoginField : current.getChildren("loginField")) { //$NON-NLS-1$
DynamicFieldBean key = new DynamicFieldBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
currentLoginField.getAttribute("name"), //$NON-NLS-1$
currentLoginField.getAttribute("defaultValue"), //$NON-NLS-1$
new Boolean(currentLoginField.getAttribute("required")), //$NON-NLS-1$
new Boolean(currentLoginField.getAttribute("password")), //$NON-NLS-1$
Boolean.valueOf(currentLoginField.getAttribute("readonly"))); //$NON-NLS-1$
currentAction.getFields().add(key);
}
for (IConfigurationElement currentLoginField : current.getChildren("button")) { //$NON-NLS-1$
DynamicButtonBean key = new DynamicButtonBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
currentLoginField.getAttribute("name"), //$NON-NLS-1$
(SelectionListener) currentLoginField.createExecutableExtension("selectionListener")); //$NON-NLS-1$
currentAction.getButtons().add(key);
}
for (IConfigurationElement currentLoginField : current.getChildren("choiceField")) { //$NON-NLS-1$
DynamicChoiceBean key = new DynamicChoiceBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
currentLoginField.getAttribute("name")); //$NON-NLS-1$
for (IConfigurationElement currentChoice : currentLoginField.getChildren("choice")) { //$NON-NLS-1$
String value = currentChoice.getAttribute("value"); //$NON-NLS-1$
String label = currentChoice.getAttribute("label"); //$NON-NLS-1$
key.addChoice(value, label);
}
currentAction.getChoices().add(key);
}
if (ArrayUtils.contains(hiddenRepository, currentAction.getId())) {
continue;
}
list.add(currentAction);
} catch (CoreException e) {
// e.printStackTrace();
ExceptionHandler.process(e);
}
}
}
return list;
}
public static IRepositoryFactory getRepositoriyById(String id) {
for (IRepositoryFactory current : getAvailableRepositories()) {
if (current.getId().equals(id)) {
return current;
}
}
return null;
}
}
// ============================================================================
//
// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.core.repository.model;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.ArrayUtils;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.swt.events.SelectionListener;
import org.talend.commons.CommonsPlugin;
import org.talend.commons.ui.runtime.exception.ExceptionHandler;
import org.talend.commons.utils.workbench.extensions.ExtensionImplementationProvider;
import org.talend.commons.utils.workbench.extensions.ExtensionPointLimiterImpl;
import org.talend.commons.utils.workbench.extensions.IExtensionPointLimiter;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.ui.branding.IBrandingService;
/**
* Provides, using extension points, implementation of many factories.
*
* <ul>
* <li>IProcessFactory</li>
* </ul>
*
* $Id: RepositoryFactoryProvider.java 38013 2010-03-05 14:21:59Z mhirt $
*/
public class RepositoryFactoryProvider {
private static List<IRepositoryFactory> list = null;
public static final IExtensionPointLimiter REPOSITORY_PROVIDER = new ExtensionPointLimiterImpl(
"org.talend.core.repository.repository_provider", //$NON-NLS-1$
"RepositoryFactory", 1, -1); //$NON-NLS-1$
public static synchronized List<IRepositoryFactory> getAvailableRepositories() {
if (list == null) {
list = new ArrayList<IRepositoryFactory>();
List<IConfigurationElement> extension = ExtensionImplementationProvider.getInstanceV2(REPOSITORY_PROVIDER);
String hiddenRepos = System.getProperty("hidden.repositories"); //$NON-NLS-1$
String hiddenRepository[] = new String[]{};
if (hiddenRepos != null) {
hiddenRepository = hiddenRepos.split(";"); //$NON-NLS-1$
}
boolean isPoweredByTalend = false;
IBrandingService brandingService = (IBrandingService) GlobalServiceRegister.getDefault()
.getService(IBrandingService.class);
isPoweredByTalend = brandingService.isPoweredbyTalend();
for (IConfigurationElement current : extension) {
try {
String only4TalendStr = current.getAttribute("only4Talend"); //$NON-NLS-1$
if (Boolean.valueOf(only4TalendStr) && !isPoweredByTalend) {
continue;
}
String only4OemStr = current.getAttribute("only4Oem"); //$NON-NLS-1$
if (Boolean.valueOf(only4OemStr) && isPoweredByTalend) {
continue;
}
IRepositoryFactory currentAction = (IRepositoryFactory) current.createExecutableExtension("class"); //$NON-NLS-1$
currentAction.setId(current.getAttribute("id")); //$NON-NLS-1$
currentAction.setName(current.getAttribute("name")); //$NON-NLS-1$
currentAction.setAuthenticationNeeded(new Boolean(current.getAttribute("authenticationNeeded"))); //$NON-NLS-1$
currentAction.setDisplayToUser(new Boolean(current.getAttribute("displayToUser")).booleanValue()); //$NON-NLS-1$
// Getting dynamic login fields:
for (IConfigurationElement currentLoginField : current.getChildren("loginField")) { //$NON-NLS-1$
DynamicFieldBean key = new DynamicFieldBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
currentLoginField.getAttribute("name"), //$NON-NLS-1$
currentLoginField.getAttribute("defaultValue"), //$NON-NLS-1$
new Boolean(currentLoginField.getAttribute("required")), //$NON-NLS-1$
new Boolean(currentLoginField.getAttribute("password")), //$NON-NLS-1$
Boolean.valueOf(currentLoginField.getAttribute("readonly"))); //$NON-NLS-1$
currentAction.getFields().add(key);
}
for (IConfigurationElement currentLoginField : current.getChildren("button")) { //$NON-NLS-1$
DynamicButtonBean key = new DynamicButtonBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
currentLoginField.getAttribute("name"), //$NON-NLS-1$
(SelectionListener) currentLoginField.createExecutableExtension("selectionListener")); //$NON-NLS-1$
currentAction.getButtons().add(key);
}
for (IConfigurationElement currentLoginField : current.getChildren("choiceField")) { //$NON-NLS-1$
DynamicChoiceBean key = new DynamicChoiceBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
currentLoginField.getAttribute("name")); //$NON-NLS-1$
for (IConfigurationElement currentChoice : currentLoginField.getChildren("choice")) { //$NON-NLS-1$
String value = currentChoice.getAttribute("value"); //$NON-NLS-1$
String label = currentChoice.getAttribute("label"); //$NON-NLS-1$
key.addChoice(value, label);
}
currentAction.getChoices().add(key);
}
if (ArrayUtils.contains(hiddenRepository, currentAction.getId())) {
continue;
}
list.add(currentAction);
} catch (CoreException e) {
// e.printStackTrace();
ExceptionHandler.process(e);
}
}
}
return list;
}
public static IRepositoryFactory getRepositoriyById(String id) {
for (IRepositoryFactory current : getAvailableRepositories()) {
if (current.getId().equals(id)) {
return current;
}
}
ExceptionHandler.log("Can't find repository factory for: " + id);
return null;
}
}

View File

@@ -15,6 +15,10 @@ package org.talend.core.repository.ui.view;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.core.runtime.Platform;
import org.eclipse.e4.ui.css.swt.theme.ITheme;
import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.IColorProvider;
@@ -23,6 +27,11 @@ import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.talend.commons.runtime.model.repository.ECDCStatus;
import org.talend.commons.runtime.model.repository.ERepositoryStatus;
import org.talend.commons.ui.runtime.image.ECoreImage;
@@ -49,6 +58,7 @@ import org.talend.core.model.repository.IRepositoryViewObject;
import org.talend.core.model.repository.RepositoryContentManager;
import org.talend.core.model.repository.RepositoryNodeProviderRegistryReader;
import org.talend.core.model.repository.RepositoryViewObject;
import org.talend.core.repository.CoreRepositoryPlugin;
import org.talend.core.repository.model.ProxyRepositoryFactory;
import org.talend.core.repository.model.repositoryObject.MetadataTableRepositoryObject;
import org.talend.core.runtime.CoreRuntimePlugin;
@@ -87,6 +97,8 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
private static final Color MERGED_REFERENCED_ITEMS_COLOR = new Color(null, 120, 120, 120);
private static final Color WHITE = new Color(null, 255, 255, 255);
private IRepositoryView view;
private static boolean refreshProperty = true;
@@ -480,6 +492,21 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
@Override
public Color getForeground(Object element) {
RepositoryNode node = (RepositoryNode) element;
try {
Bundle bundle = Platform.getBundle(CoreRepositoryPlugin.PLUGIN_ID);
BundleContext context = bundle.getBundleContext();
ServiceReference ref = context.getServiceReference(IThemeManager.class.getName());
IThemeManager manager = (IThemeManager) context.getService(ref);
IThemeEngine engine = manager
.getEngineForDisplay(PlatformUI.getWorkbench().getActiveWorkbenchWindow() == null ? Display.getCurrent()
: PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().getDisplay());
ITheme curTheme = engine.getActiveTheme();
if (curTheme.getId().contains("dark")) {
return null;
}
} catch (Exception ex) {
ex.printStackTrace();
}
switch (node.getType()) {
case REFERENCED_PROJECT:
return STABLE_PRIMARY_ENTRY_COLOR;

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Core Runtime Plug-in
Bundle-SymbolicName: org.talend.core.runtime;singleton:=true
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.8.8.qualifier
Bundle-Localization: plugin
Bundle-Vendor: .Talend SA.
Export-Package: org.talend.analysistask,
@@ -129,7 +129,8 @@ Require-Bundle: org.eclipse.jdt.core,
jackson-core-asl,
org.talend.libraries.jackson,
org.eclipse.m2e.core,
org.talend.libraries.apache.common
org.talend.libraries.apache.common,
org.talend.signon.util
Bundle-Activator: org.talend.core.runtime.CoreRuntimePlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,

View File

@@ -16,12 +16,14 @@ bin.includes = META-INF/,\
lib/delight-rhino-sandbox-0.0.15.jar,\
lib/rhino-1.7.13.jar,\
plugin_de.properties,\
plugin_en.properties,\
plugin_fr.properties,\
plugin_it.properties,\
plugin_ja.properties,\
plugin_ru.properties,\
plugin_swtbot.properties,\
plugin_zh_CN.properties
plugin_zh_CN.properties,\
resources/
src.includes = META-INF/,\
mappingMetadataTypes.xml,\
mappings/,\

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.runtime</artifactId>

View File

@@ -0,0 +1,41 @@
## Component
tSnowflakeConfiguration=java.base/java.nio
tSnowflakeInput=java.base/java.nio
tSnowflakeOutput=java.base/java.nio
tFTPClose=java.base/sun.security.ssl,java.base/sun.security.util
tFTPConnection=java.base/sun.security.ssl,java.base/sun.security.util
tFTPDelete=java.base/sun.security.ssl,java.base/sun.security.util
tFTPFileExist=java.base/sun.security.ssl,java.base/sun.security.util
tFTPFileList=java.base/sun.security.ssl,java.base/sun.security.util
tFTPFileProperties=java.base/sun.security.ssl,java.base/sun.security.util
tFTPGet=java.base/sun.security.ssl,java.base/sun.security.util
tFTPPut=java.base/sun.security.ssl,java.base/sun.security.util
tFTPRename=java.base/sun.security.ssl,java.base/sun.security.util
tFTPTruncate=java.base/sun.security.ssl,java.base/sun.security.util
tNeo4jBatchOutput=java.base/java.lang,java.base/sun.nio.ch
tNeo4jBatchOutputRelationship=java.base/java.lang,java.base/sun.nio.ch
tNeo4jBatchSchema=java.base/java.lang,java.base/sun.nio.ch
tNeo4jClose=java.base/java.lang,java.base/sun.nio.ch
tNeo4jConnection=java.base/java.lang,java.base/sun.nio.ch
tNeo4jImportTool=java.base/java.lang,java.base/sun.nio.ch
tNeo4jInput=java.base/java.lang,java.base/sun.nio.ch
tNeo4jRow=java.base/java.lang,java.base/sun.nio.ch
tMatchGroup=java.base/java.io
tRuleSurvivorship=java.base/java.lang
tRecordMatching=java.base/java.io
tDqReportRun=java.base/java.lang
tWebService=java.base/java.lang
tWebServiceInput=java.base/java.lang
## TCK framework
TCK_COMMON_ARGS=java.base/java.io,java.base/java.lang.invoke,java.base/java.lang.reflect,java.base/java.lang,java.base/java.net,java.base/java.nio,java.base/java.util,java.base/sun.nio.ch
## BigData distribution
SPARK_3_3_x=java.base/java.nio,java.base/sun.nio.ch,java.base/java.util,java.base/java.lang.invoke,java.base/sun.util.calendar
SPARK_3_2_x=java.base/java.nio,java.base/sun.nio.ch,java.base/java.util,java.base/java.lang.invoke,java.base/sun.util.calendar
SPARK_3_1_x=java.base/java.nio,java.base/sun.nio.ch,java.base/java.util,java.base/java.lang.invoke,java.base/sun.util.calendar
SPARK_2_4_x=java.base/java.nio,java.base/sun.nio.ch,java.base/java.util,java.base/java.lang.invoke,java.base/sun.util.calendar

View File

@@ -58,6 +58,8 @@ public final class JavaUtils {
public static final List<String> AVAILABLE_VERSIONS = Arrays.asList(JavaCore.VERSION_1_8 );
public static final String ALLOW_JAVA_INTERNAL_ACCESS = "allow.java.internal.access"; //$NON-NLS-1$
public static final String PROCESSOR_TYPE = "javaProcessor"; //$NON-NLS-1$
public static final String PATH_SEPARATOR = "/"; //$NON-NLS-1$

View File

@@ -31,6 +31,7 @@ import org.talend.core.model.metadata.ColumnNameChanged;
import org.talend.core.model.metadata.IMetadataTable;
import org.talend.core.model.metadata.builder.connection.MetadataTable;
import org.talend.core.model.properties.Item;
import org.talend.core.model.properties.Property;
import org.talend.core.model.repository.IRepositoryViewObject;
import org.talend.core.runtime.process.ITalendProcessJavaProject;
import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
@@ -134,6 +135,12 @@ public interface ICoreService extends IService {
*/
void installComponents(IProgressMonitor monitor);
Integer getSignatureVerifyResult(Property property, IPath resourcePath, boolean considerGP) throws Exception;
String getLicenseCustomer();
boolean isInValidGP();
public static ICoreService get() {
if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreService.class)) {
return GlobalServiceRegister.getDefault().getService(ICoreService.class);

View File

@@ -38,10 +38,11 @@ public interface ITDQCryptoFileService extends IService {
* Generate Encrypty file
*/
public void generateCryptoFile(String passwordM1, String cryptoMethod, String cryptoFilePath);
/**
* Generate Encrypty file
*/
public void generateCryptoFile(String passwordM1, String cryptoMethod, String cryptoFilePath, int algoVersion);
}

View File

@@ -15,8 +15,10 @@ package org.talend.core.context;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.core.model.general.Project;
import org.talend.core.model.properties.User;
import org.talend.core.service.ICloudSignOnService;
/**
* DOC smallet class global comment. Detailled comment <br/>
@@ -139,6 +141,14 @@ public class RepositoryContext {
* @return the clearPassword
*/
public String getClearPassword() {
try {
if (ICloudSignOnService.get() != null && ICloudSignOnService.get().isSignViaCloud()) {
return ICloudSignOnService.get().getLatestToken().getAccessToken();
}
}catch (Exception ex) {
ExceptionHandler.process(ex);
}
return clearPassword;
}

View File

@@ -147,8 +147,15 @@ public enum EDatabaseTypeName {
MAPRDB(
"MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true),//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
SNOWFLAKE(
"SNOWFLAKE","SNOWFLAKE",Boolean.TRUE,"SNOWFLAKE",EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.None);
"SNOWFLAKE",
"SNOWFLAKE",
Boolean.TRUE,
"SNOWFLAKE",
EDatabaseSchemaOrCatalogMapping.None,
EDatabaseSchemaOrCatalogMapping.None,
true);
// displayName is used in Java code.
private String displayName;

View File

@@ -351,11 +351,19 @@ public class ConnParameterKeys {
public static final String CONN_PARA_KEY_DATABRICKS_CLOUD_PROVIDER = "CONN_PARA_KEY_DATABRICKS_CLOUD_PROVIDER";
public static final String CONN_PARA_KEY_DATABRICKS_CLUSTER_TYPE = "CONN_PARA_KEY_DATABRICKS_CLUSTER_TYPE";
public static final String CONN_PARA_KEY_DATABRICKS_RUN_MODE = "CONN_PARA_KEY_DATABRICKS_RUN_MODE";
public static final String CONN_PARA_KEY_DATABRICKS_CLUSTER_ID="CONN_PARA_KEY_DATABRICKS_CLUSTER_ID";
public static final String CONN_PARA_KEY_DATABRICKS_TOKEN="CONN_PARA_KEY_DATABRICKS_TOKEN";
public static final String CONN_PARA_KEY_DATABRICKS_NODE_TYPE="CONN_PARA_KEY_DATABRICKS_NODE_TYPE";
public static final String CONN_PARA_KEY_DATABRICKS_DRIVER_NODE_TYPE="CONN_PARA_KEY_DATABRICKS_DRIVER_NODE_TYPE";
public static final String CONN_PARA_KEY_DATABRICKS_RUNTIME_VERSION="CONN_PARA_KEY_DATABRICKS_RUNTIME_VERSION";
public static final String CONN_PARA_KEY_DATABRICKS_DBFS_DEP_FOLDER="CONN_PARA_KEY_DATABRICKS_DBFS_DEP_FOLDER";
@@ -379,6 +387,8 @@ public class ConnParameterKeys {
public static final String CONN_PARA_KEY_KNOX_DIRECTORY="CONN_PARA_KEY_KNOX_DIRECTORY";
public static final String CONN_PARA_KEY_KNOX_TIMEOUT="CONN_PARA_KEY_KNOX_TIMEOUT";
// CDE
public static final String CONN_PARA_KEY_CDE_API_ENDPOINT="CONN_PARA_KEY_CDE_API_ENDPOINT";
public static final String CONN_PARA_KEY_CDE_TOKEN="CONN_PARA_KEY_CDE_TOKEN";

View File

@@ -207,7 +207,13 @@ public enum EDatabaseConnTemplate {
"2181")), //$NON-NLS-1$
MAPRDB(new DbConnStr(EDatabaseTypeName.MAPRDB, "127.0.0.1", //$NON-NLS-1$
"5181")); //$NON-NLS-1$
"5181")), //$NON-NLS-1$
SNOWFLAKE(
new DbConnStr(EDatabaseTypeName.SNOWFLAKE, //
"jdbc:snowflake://<host>:<port>/?<property>",
"3306" //$NON-NLS-1$
)); // $NON-NLS-1$
private DbConnStr connStr;

View File

@@ -83,7 +83,8 @@ public enum EDatabaseVersion4Drivers {
"Microsoft SQL Server 2012", "Microsoft SQL Server 2012", "jtds-1.3.1-patch-20190523.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
MSSQL_PROP(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
"Microsoft", "MSSQL_PROP", //$NON-NLS-1$ //$NON-NLS-2$
new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.29.jar", "slf4j-log4j12-1.7.29.jar", "msal4j-1.11.0.jar", //$NON-NLS-1$
new String[] { "mssql-jdbc-actual.jar", "slf4j-api-1.7.29.jar", "slf4j-log4j12-1.7.29.jar", //$NON-NLS-1$
"msal4j-1.11.0.jar",
"oauth2-oidc-sdk-9.7.jar", "reload4j-1.2.19.jar", "jackson-core-2.13.2.jar",
"jackson-databind-2.13.2.2.jar", "jackson-annotations-2.13.2.jar", "jcip-annotations-1.0-1.jar",
"json-smart-2.4.7.jar", "nimbus-jose-jwt-9.22.jar", "accessors-smart-2.4.7.jar", "asm-9.1.jar",
@@ -95,12 +96,12 @@ public enum EDatabaseVersion4Drivers {
GREENPLUM_PSQL(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM,"PostgreSQL", "POSTGRESQL", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$
GREENPLUM(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM,"Greenplum", "GREENPLUM", "greenplum-5.1.4.000275.jar")), //$NON-NLS-1$
// PSQL_V10(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v10", "V10", "postgresql-42.2.5.jar")),
PSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v9 and later", "V9_X", "postgresql-42.2.25.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
PSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v9 and later", "V9_X", "postgresql-42.2.26.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
PSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "Prior to v9", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
PLUSPSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL,
"Prior to v9", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9 and later", "V9_X", "postgresql-42.2.25.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9 and later", "V9_X", "postgresql-42.2.26.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
IBMDB2(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
"db2jcc_license_cisuz.jar" })), //$NON-NLS-1$
IBMDB2ZOS(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2ZOS, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$

View File

@@ -154,6 +154,14 @@ public enum EHadoopProperties {
DATABRICKS_DBFS_DEP_FOLDER,
DATABRICKS_NODE_TYPE,
DATABRICKS_DRIVER_NODE_TYPE,
DATABRICKS_RUNTIME_VERSION,
DATABRICKS_CLUSTER_TYPE,
UNIV_STANDALONE_MASTER,
UNIV_STANDALONE_EXEC_MEMORY,

View File

@@ -222,6 +222,32 @@ public class ContextUtils {
}
return parameterType;
}
// TUP-36519:For possible duplicate internalid scenario(TUP-36667) after several times' renaming in joblet. Loop all and find the nearest
// one.
public static ContextParameterType getContextParameterTypeById(ContextType contextType, final String uuId,
boolean isFromContextItem, String paraName) {
if (contextType == null || uuId == null) {
return null;
}
ContextParameterType parameterType = null;
for (ContextParameterType param : (List<ContextParameterType>) contextType.getContextParameter()) {
String paramId = null;
if (isFromContextItem) {
paramId = ResourceHelper.getUUID(param);
} else {
paramId = param.getInternalId();
}
if (uuId.equals(paramId)) {
parameterType = param;
if (paraName != null && StringUtils.equals(paraName, param.getName())) {
break;
}
}
}
return parameterType;
}
public static ContextParameterType getContextParameterTypeById(ContextType contextType, final String uuId,
boolean isFromContextItem) {
@@ -846,7 +872,7 @@ public class ContextUtils {
if (item != null) {
final ContextType repoContextType = ContextUtils.getContextTypeByName(item, contextType.getName());
ContextParameterType repoContextParam = ContextUtils.getContextParameterTypeById(repoContextType,
paramLink.getId(), item instanceof ContextItem);
paramLink.getId(), item instanceof ContextItem, contextParameterType.getName());
if (repoContextParam != null
&& !StringUtils.equals(repoContextParam.getName(), contextParameterType.getName())) {
renamedMap.put(repoContextParam.getName(), contextParameterType.getName());
@@ -915,7 +941,7 @@ public class ContextUtils {
if (item != null) {
ContextType contextType = ContextUtils.getContextTypeByName(item, context.getName());
ContextParameterType repoParameterType = ContextUtils.getContextParameterTypeById(contextType,
parameterLink.getId(), item instanceof ContextItem);
parameterLink.getId(), item instanceof ContextItem, parameterType.getName());
if (repoParameterType != null
&& !StringUtils.equals(repoParameterType.getName(), parameterType.getName())) {
renamedMap.put(repoParameterType.getName(), parameterType.getName());
@@ -975,7 +1001,7 @@ public class ContextUtils {
ContextParameterType contextParameterType = null;
if (paramLink != null && paramLink.getId() != null && contextType != null) {
contextParameterType = getContextParameterTypeById(contextType, paramLink.getId(),
contextItem instanceof ContextItem);
contextItem instanceof ContextItem, paramName);
}
if (contextParameterType != null) {// Compare use UUID
if (!StringUtils.equals(contextParameterType.getName(), paramName)) {

View File

@@ -17,10 +17,15 @@ import java.util.Iterator;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.core.pendo.PendoTrackSender;
import org.talend.core.runtime.i18n.Messages;
import org.talend.core.service.ICloudSignOnService;
import org.talend.repository.model.RepositoryConstants;
import org.talend.signon.util.TMCRepositoryUtil;
import org.talend.signon.util.TokenMode;
import org.talend.utils.json.JSONException;
import org.talend.utils.json.JSONObject;
@@ -58,12 +63,14 @@ public class ConnectionBean implements Cloneable {
private static final String TOKEN = "token"; //$NON-NLS-1$
private static final String URL = "url"; //$NON-NLS-1$
private static final String STORECREDENTIALS = "storeCredentials"; //$NON-NLS-1$
private String credentials = ""; //$NON-NLS-1$
public static final String CLOUD_TOKEN_ID ="cloud_token"; //$NON-NLS-1$
private static final String LOGIN_VIA_CLOUD = "login_via_cloud"; //$NON-NLS-1$
/**
* DOC smallet ConnectionBean constructor comment.
*/
@@ -89,6 +96,24 @@ public class ConnectionBean implements Cloneable {
newConnection.setPassword(""); //$NON-NLS-1$
return newConnection;
}
public static ConnectionBean getDefaultCloudConnectionBean(String dataCenter) {
ConnectionBean newConnection = new ConnectionBean();
newConnection.setName(Messages.getString("ConnectionBean.Cloud.name", TMCRepositoryUtil.getDisplayNameByDatacenter(dataCenter))); //$NON-NLS-1$
newConnection.setDescription(Messages.getString("ConnectionBean.CloudConnection.description", TMCRepositoryUtil.getDisplayNameByDatacenter(dataCenter))); //$NON-NLS-1$
newConnection.setRepositoryId(TMCRepositoryUtil.getRepositoryId(dataCenter));
newConnection.setToken(true);
newConnection.setStoreCredentials(true);
newConnection.setComplete(true);
newConnection.setLoginViaCloud(true);
newConnection.setWorkSpace(getRecentWorkSpace());
return newConnection;
}
protected static String getRecentWorkSpace() {
String filePath = new Path(Platform.getInstanceLocation().getURL().getPath()).toFile().getPath();
return filePath;
}
/**
* Getter for ID.
@@ -184,13 +209,22 @@ public class ConnectionBean implements Cloneable {
*/
public String getPassword() {
try {
if (conDetails.has(PASSWORD)) {
if (isStoreCredentials() && credentials != null) {
return this.credentials;
}
return conDetails.getString(PASSWORD);
} else if (conDetails.has(CLOUD_TOKEN_ID)){
String object = conDetails.getString(CLOUD_TOKEN_ID);
TokenMode token = TokenMode.parseFromJson(object, null);
if (ICloudSignOnService.get() != null) {
token = ICloudSignOnService.get().getLatestToken();
this.setConnectionToken(token);
}
return token.getAccessToken();
}
} catch (JSONException e) {
} catch (Exception e) {
ExceptionHandler.process(e);
}
return "";
@@ -215,7 +249,7 @@ public class ConnectionBean implements Cloneable {
* @return the user
*/
public String getUser() {
try {
try {
if (conDetails.has(USER)) {
String user = conDetails.getString(USER);
if (isToken()) {
@@ -226,7 +260,7 @@ public class ConnectionBean implements Cloneable {
}
}
return user;
}
}
} catch (JSONException e) {
ExceptionHandler.process(e);
}
@@ -320,6 +354,25 @@ public class ConnectionBean implements Cloneable {
ExceptionHandler.process(e);
}
}
public boolean isLoginViaCloud() {
try {
if (conDetails.has(LOGIN_VIA_CLOUD)) {
return (Boolean) conDetails.get(LOGIN_VIA_CLOUD);
}
} catch (JSONException e) {
// do nothing
}
return false;
}
public void setLoginViaCloud(boolean isLoginViaCloud) {
try {
conDetails.put(LOGIN_VIA_CLOUD, isLoginViaCloud);
} catch (JSONException e) {
// do nothing
}
}
@Override
public ConnectionBean clone() throws CloneNotSupportedException {
@@ -418,14 +471,21 @@ public class ConnectionBean implements Cloneable {
public String getUrl() {
try {
if (conDetails.has(URL)) {
return conDetails.getString(URL);
if (dynamicFields.containsKey(RepositoryConstants.REPOSITORY_URL)) {
return dynamicFields.get(RepositoryConstants.REPOSITORY_URL);
}
if (conDetails.has(RepositoryConstants.REPOSITORY_URL)) {
return conDetails.getString(RepositoryConstants.REPOSITORY_URL);
}
} catch (JSONException e) {
ExceptionHandler.process(e);
}
return "";
}
public void setUrl(String url) {
dynamicFields.put(RepositoryConstants.REPOSITORY_URL, url);
}
public boolean isStoreCredentials() {
try {
@@ -453,4 +513,27 @@ public class ConnectionBean implements Cloneable {
public void setCredentials(String credentials) {
this.credentials = credentials;
}
public TokenMode getConnectionToken() {
try {
if (conDetails.has(CLOUD_TOKEN_ID)) {
String object = conDetails.getString(CLOUD_TOKEN_ID);
return TokenMode.parseFromJson(object, null);
}
} catch (JSONException e) {
ExceptionHandler.process(e);
}
return null;
}
public void setConnectionToken(TokenMode connectionToken) {
try {
conDetails.put(CLOUD_TOKEN_ID, TokenMode.writeToJson(connectionToken));
} catch (JSONException e) {
ExceptionHandler.process(e);
}
}
}

View File

@@ -13,17 +13,16 @@
package org.talend.core.model.general;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.eclipse.core.runtime.Path;
import org.osgi.framework.Version;
import org.talend.commons.CommonsPlugin;
import org.talend.commons.exception.CommonExceptionHandler;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.ILibraryManagerService;
@@ -108,7 +107,7 @@ public class ModuleNeeded {
private Map<String, String> attributes;
ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
ILibraryManagerService libManagerService = GlobalServiceRegister.getDefault()
.getService(ILibraryManagerService.class);
@@ -369,7 +368,7 @@ public class ModuleNeeded {
}
public ELibraryInstallStatus getStatus() {
ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
ILibraryManagerService libManagerService = GlobalServiceRegister.getDefault()
.getService(ILibraryManagerService.class);
libManagerService.checkModuleStatus(this);
String mvnUriStatusKey = getMavenUri();
@@ -378,7 +377,7 @@ public class ModuleNeeded {
}
public ELibraryInstallStatus getDeployStatus() {
ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
ILibraryManagerService libManagerService = GlobalServiceRegister.getDefault()
.getService(ILibraryManagerService.class);
libManagerService.checkModuleStatus(this);
String mvnUriStatusKey = getMavenUri();
@@ -715,6 +714,21 @@ public class ModuleNeeded {
if (!StringUtils.isEmpty(mavenUriFromConfiguration)) {
this.mavenUri = mavenUriFromConfiguration;
}
String generateModuleName = MavenUrlHelper.generateModuleNameByMavenURI(this.mavenUri);
if (StringUtils.isNotBlank(generateModuleName)) {
if (!StringUtils.equals(getModuleName(), generateModuleName)) {
if (CommonsPlugin.isDebugMode() && StringUtils.isNotBlank(this.context)) {
CommonExceptionHandler
.warn("module name definition should be " + generateModuleName + ", not " + getModuleName()
+ " :" + this.context);
}
setModuleName(generateModuleName);
}
}
}
public boolean usedByDynamicDistribution() {

View File

@@ -194,6 +194,10 @@ public interface IMetadataConnection extends IMetadata {
public String getContextName();
public void setContextName(String contextName);
public boolean isSupportNLS();
public void setSupportNLS(boolean newSupportNLS);
/**
* Returns the value that you stored in the data collection by the key. Normally, it is like this key-value. For

View File

@@ -2,41 +2,51 @@ package org.talend.core.model.metadata;
import java.util.Arrays;
import java.util.List;
import org.talend.core.model.process.IElementParameter;
import org.talend.core.model.process.INode;
public class SparkBatchMetadataTalendTypeFilter extends SparkMetadataTalendTypeFilter{
public class SparkBatchMetadataTalendTypeFilter
extends SparkMetadataTalendTypeFilter {
private INode node;
private INode node;
public static List<String> dynamicTypeCompatibleComponents = Arrays.asList(
"tDeltaLakeInput",
"tDeltaLakeOutput",
"tFileInputParquet",
"tFileOutputParquet",
"tJDBCInput",
"tJDBCOutput", "tLogRow", "tSqlRow"
);
public static List<String> dynamicTypeCompatibleComponents = Arrays.asList(
"tDeltaLakeInput",
"tDeltaLakeOutput",
"tFileInputDelimited",
"tFileInputParquet",
"tFileOutputParquet",
"tJDBCInput",
"tJDBCOutput",
"tLogRow",
"tMongoDBInput",
"tMongoDBOutput",
"tSqlRow"
);
public SparkBatchMetadataTalendTypeFilter(INode node) {
super(node.getComponent().getName());
this.node = node;
public SparkBatchMetadataTalendTypeFilter(INode node) {
super(node.getComponent().getName());
this.node = node;
}
@Override
public List<String> getComponentSpecificTypes() {
// For the moment only dynamic type is a component specific type
// dynamic type is available under 2 conditions : job uses Dataset API and component is listed in
// dynamicTypeCompatibleComponents
INode configNode = node
.getProcess()
.getNodesOfType("tSparkConfiguration")
.get(0);
IElementParameter param = configNode.getElementParameter("USE_DATASET_API");
if (Boolean.FALSE.equals(param.getValue())) {
return null;
}
@Override
public List<String> getComponentSpecificTypes() {
// For the moment only dynamic type is a component specific type
// dynamic type is available under 2 conditions : job uses Dataset API and component is listed in
// dynamicTypeCompatibleComponents
INode configNode = node.getProcess().getNodesOfType("tSparkConfiguration").get(0);
IElementParameter param = configNode.getElementParameter("USE_DATASET_API");
if (Boolean.FALSE.equals(param.getValue())) {
return null;
}
if (dynamicTypeCompatibleComponents.contains(node.getComponent().getName())) {
return Arrays.asList(SparkMetadataTalendTypeFilter.DYNAMIC);
}
return null;
if (
dynamicTypeCompatibleComponents.contains(node.getComponent().getName())
) {
return Arrays.asList(SparkMetadataTalendTypeFilter.DYNAMIC);
}
return null;
}
}

View File

@@ -260,6 +260,7 @@ public final class ConvertionHelper {
result.setContentModel(connection.isContextMode());
result.setContextId(sourceConnection.getContextId());
result.setContextName(sourceConnection.getContextName());
result.setSupportNLS(sourceConnection.isSupportNLS());
// handle oracle database connnection of general_jdbc.
result.setSchema(getMeataConnectionSchema(result));
convertOtherParameters(result, connection);

View File

@@ -113,6 +113,7 @@ public class MetadataConnection implements IMetadataConnection {
private String contextName;
private boolean supportNLS = false;
// ~
private String comment;
@@ -729,6 +730,14 @@ public class MetadataConnection implements IMetadataConnection {
public void setContextName(String contextName) {
this.contextName = contextName;
}
public boolean isSupportNLS() {
return supportNLS;
}
public void setSupportNLS(boolean supportNLS) {
this.supportNLS = supportNLS;
}
/*
* (non-Javadoc)

View File

@@ -1250,6 +1250,11 @@ public class RepositoryToComponentProperty {
return value2;
}
if(value.equals("SUPPORT_NLS")) {
return connection.isSupportNLS();
}
if (value.equals("CDC_TYPE_MODE")) { //$NON-NLS-1$
return new Boolean(CDCTypeMode.LOG_MODE.getName().equals(connection.getCdcTypeMode()));
}

View File

@@ -24,6 +24,7 @@ import org.eclipse.ui.preferences.ScopedPreferenceStore;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.commons.utils.PasswordEncryptUtil;
import org.talend.commons.utils.generation.CodeGenerationUtils;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.language.ECodeLanguage;
import org.talend.core.language.LanguageManager;
import org.talend.core.model.metadata.types.JavaType;
@@ -37,6 +38,7 @@ import org.talend.core.model.repository.IRepositoryViewObject;
import org.talend.core.model.utils.JavaResourcesHelper;
import org.talend.core.model.utils.SQLPatternUtils;
import org.talend.core.runtime.CoreRuntimePlugin;
import org.talend.core.service.IDesignerXMLMapperService;
import org.talend.core.utils.TalendQuoteUtils;
import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
@@ -293,8 +295,7 @@ public final class ElementParameterParser {
List<IElementParameter> params = (List<IElementParameter>) element.getElementParametersWithChildrens();
if (params != null && !params.isEmpty()) {
for (int i = 0; i < params.size(); i++) {
IElementParameter param = params.get(i);
for (IElementParameter param : params) {
if (text.indexOf(param.getVariableName()) != -1
|| (param.getVariableName() != null && param.getVariableName().contains(text))) {
if (param.getFieldType() == EParameterFieldType.TABLE) {
@@ -422,8 +423,8 @@ public final class ElementParameterParser {
}
IElementParameter param;
for (int i = 0; i < element.getElementParameters().size(); i++) {
param = element.getElementParameters().get(i);
for (IElementParameter element2 : element.getElementParameters()) {
param = element2;
if (text.indexOf(param.getVariableName()) != -1) {
if (param.getFieldType() == EParameterFieldType.TABLE) {
return createTableValuesXML((List<Map<String, Object>>) param.getValue(), param);
@@ -483,7 +484,21 @@ public final class ElementParameterParser {
if (element instanceof INode) {
INode node = (INode) element;
if (node.getExternalNode() != null) {
return EcoreUtil.copy(node.getExternalNode().getExternalEmfData());
Object obj = null;
if (node.isVirtualGenerateNode()) {
if (GlobalServiceRegister.getDefault().isServiceRegistered(IDesignerXMLMapperService.class)) {
final IDesignerXMLMapperService service = GlobalServiceRegister.getDefault()
.getService(IDesignerXMLMapperService.class);
if (service != null) {
obj = service.rebuildXmlMapData(node.getExternalNode());
}
}
}
if (obj != null) {
return obj;
} else {
return EcoreUtil.copy(node.getExternalNode().getExternalEmfData());
}
}
}
return null;
@@ -496,8 +511,8 @@ public final class ElementParameterParser {
}
IElementParameter param;
newText = text;
for (int i = 0; i < element.getElementParameters().size(); i++) {
param = element.getElementParameters().get(i);
for (IElementParameter element2 : element.getElementParameters()) {
param = element2;
if (newText.contains(param.getVariableName())) {
String value = getDisplayValue(param);
newText = newText.replace(param.getVariableName(), value);

View File

@@ -37,7 +37,7 @@ public abstract class AbstractJobParameterInRepositoryRelationshipHandler extend
Set<Relation> relationSet = new HashSet<Relation>();
for (ElementParameterType paramType : parametersMap.values()) {
if (paramType.getName().endsWith(":" + getRepositoryTypeName())) { //$NON-NLS-1$
if (paramType.getName() != null && paramType.getName().endsWith(":" + getRepositoryTypeName())) { //$NON-NLS-1$
String name = paramType.getName().split(":")[0]; //$NON-NLS-1$
ElementParameterType repositoryTypeParam = parametersMap.get(name + ":" //$NON-NLS-1$
+ getRepositoryTypeName());

View File

@@ -359,7 +359,9 @@ public abstract class RepositoryUpdateManager {
List<UpdateResult> checkedResults = null;
if (parameter == null) { // update all job
checkedResults = filterSpecialCheckedResult(results);
// TUP-36519: comment out the filter for only opening job
// checkedResults = filterSpecialCheckedResult(results);
checkedResults = results;
} else { // filter
checkedResults = filterCheckedResult(results);
}

View File

@@ -27,6 +27,7 @@ import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
import org.talend.core.service.IRemoteService;
import org.talend.repository.model.IProxyRepositoryFactory;
import org.talend.repository.model.RepositoryConstants;
import org.talend.utils.security.StudioEncryption;
/**
* created by wchen on 2015年6月16日 Detailled comment
@@ -255,7 +256,7 @@ public class TalendLibsServerManager {
if (enableProxyFlag) {
serverBean.setServer(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_URL));
serverBean.setUserName(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_USERNAME));
serverBean.setPassword(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_PASSWORD));
serverBean.setPassword(StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.SYSTEM).decrypt(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_PASSWORD)));
serverBean.setRepositoryId(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_REPOSITORY_ID));
serverBean.setType(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_TYPE));
}

View File

@@ -0,0 +1,161 @@
// ============================================================================
//
// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.core.pendo;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.commons.lang.StringUtils;
import org.eclipse.emf.common.util.EMap;
import org.talend.commons.utils.VersionUtils;
import org.talend.core.model.general.Project;
import org.talend.core.model.properties.Property;
import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
import org.talend.core.runtime.util.EmfResourceUtil;
import org.talend.repository.ProjectManager;
import org.talend.utils.security.CryptoMigrationUtil;
import org.talend.utils.security.StudioEncryption;
/**
* DOC jding class global comment. Detailled comment
*/
public class PendoItemSignatureUtil {
public static final String MIGRATION_TOKEN_KEY = "force_import_unsupported_job";
public static final String REPOSITORY_PLUGIN_ID = "org.talend.repository";
public static final String PROJ_DATE_ID = "repository.project.id";
public static final String PROD_DATE_ID = "product.date.id";
public static String getCurrentProjectCreateDate() {
Project currentProject = ProjectManager.getInstance().getCurrentProject();
if (currentProject != null) {
ProjectPreferenceManager projectPrefManager = new ProjectPreferenceManager(
PendoItemSignatureUtil.REPOSITORY_PLUGIN_ID, false);
String projDate = projectPrefManager.getValue(PendoItemSignatureUtil.PROJ_DATE_ID);
if (StringUtils.isNotBlank(projDate)) {
String decrypt = null;
if (StudioEncryption.hasEncryptionSymbol(projDate)) {
decrypt = StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.MIGRATION_TOKEN)
.decrypt(projDate);
} else {
decrypt = CryptoMigrationUtil.decrypt(projDate);
}
return decrypt;
}
}
return null;
}
public static String getStudioVersion() {
String studioVersion = VersionUtils.getDisplayVersion();
String patchInstalledVersion = PendoTrackDataUtil.getLatestPatchInstalledVersion();
if (StringUtils.isNotBlank(patchInstalledVersion)) {
studioVersion = patchInstalledVersion;
}
return studioVersion;
}
public static String getItemProductVersion(Property property) {
String productVersion = null;
EMap additionalProperties = property.getAdditionalProperties();
if (additionalProperties.get("modified_product_version") != null) {
productVersion = additionalProperties.get("modified_product_version").toString();
} else if (additionalProperties.get("created_product_version") != null) {
productVersion = additionalProperties.get("created_product_version").toString();
}
if (StringUtils.isNotBlank(productVersion)) {
productVersion = VersionUtils.getTalendPureVersion(productVersion);
}
return productVersion;
}
public static String getItemProductName(Property property) {
String productName = null;
EMap additionalProperties = property.getAdditionalProperties();
if (additionalProperties.get("modified_product_fullname") != null) {
productName = additionalProperties.get("modified_product_fullname").toString();
} else if (additionalProperties.get("created_product_fullname") != null) {
productName = additionalProperties.get("created_product_fullname").toString();
}
return productName;
}
public static String formatDate(String dateString, String pattern) {
String formattedDate = "";
if (StringUtils.isNotBlank(dateString)) {
Date date = new Date(Long.parseLong(dateString));
SimpleDateFormat sdf = new SimpleDateFormat(pattern);
formattedDate = sdf.format(date);
}
return formattedDate;
}
public interface SignatureStatus {
public static final int V_VALID = 0;
public static final int V_INVALID = EmfResourceUtil.V_INVALID << 0;
public static final int V_UNSIGNED = V_INVALID << 1;
}
public enum TOSProdNameEnum {
TOS_DI("Talend Open Studio for Data Integration"),
TOS_BD("Talend Open Studio for Big Data"),
TOS_ESB("Talend Open Studio for ESB"),
TOS_TOP("Talend Open Studio for Data Quality");
private String prodName;
TOSProdNameEnum(String prodName) {
this.prodName = prodName;
}
public String getProdName() {
return prodName;
}
public static String getTOSCategoryByProdName(String prodName) {
String category = null;
for (TOSProdNameEnum tosProdNameEnum : TOSProdNameEnum.values()) {
if (tosProdNameEnum.getProdName().equals(prodName)) {
category = tosProdNameEnum.name();
break;
}
}
return category;
}
}
public enum ValueEnum {
YES("Y"),
NO("N"),
NOT_APPLICATE("N/A");
private String displayValue;
ValueEnum(String displayValue) {
this.displayValue = displayValue;
}
public String getDisplayValue() {
return displayValue;
}
}
}

View File

@@ -19,13 +19,17 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.commons.utils.VersionUtils;
import org.talend.core.model.general.Project;
import org.talend.core.model.properties.ProjectReference;
import org.talend.core.pendo.properties.IPendoDataProperties;
import org.talend.core.pendo.properties.PendoLoginProperties;
import org.talend.core.service.ICloudSignOnService;
import org.talend.core.service.IStudioLiteP2Service;
import org.talend.core.service.IStudioLiteP2Service.UpdateSiteConfig;
import org.talend.core.ui.IInstalledPatchService;
import org.talend.repository.ProjectManager;
import org.talend.utils.json.JSONObject;
@@ -61,11 +65,7 @@ public class PendoTrackDataUtil {
}
public static IPendoDataProperties getLoginEventProperties() {
String studioPatch = null;
IInstalledPatchService installedPatchService = IInstalledPatchService.get();
if (installedPatchService != null) {
studioPatch = installedPatchService.getLatestInstalledPatchVersion();
}
String studioPatch = getLatestPatchInstalledVersion();
PendoLoginProperties loginEvent = new PendoLoginProperties();
IStudioLiteP2Service studioLiteP2Service = IStudioLiteP2Service.get();
try {
@@ -85,6 +85,18 @@ public class PendoTrackDataUtil {
loginEvent.setEnabledFeatures(enabledFeatures);
}
setUpRefProjectsStructure(loginEvent);
loginEvent.setIsOneClickLogin(Boolean.FALSE.toString());
if (ICloudSignOnService.get() != null && ICloudSignOnService.get().isSignViaCloud()) {
loginEvent.setIsOneClickLogin(Boolean.TRUE.toString());
}
loginEvent.setManagedUpdate(Boolean.FALSE.toString());
if (IStudioLiteP2Service.get() != null) {
IProgressMonitor monitor = new NullProgressMonitor();
UpdateSiteConfig config = IStudioLiteP2Service.get().getUpdateSiteConfig(monitor);
if (config.isEnableTmcUpdateSettings(monitor) && !config.isOverwriteTmcUpdateSettings(monitor)) {
loginEvent.setManagedUpdate(Boolean.TRUE.toString());
}
}
} catch (Exception e) {
ExceptionHandler.process(e);
}
@@ -93,6 +105,15 @@ public class PendoTrackDataUtil {
return loginEvent;
}
public static String getLatestPatchInstalledVersion() {
String studioPatch = "";
IInstalledPatchService installedPatchService = IInstalledPatchService.get();
if (installedPatchService != null) {
studioPatch = installedPatchService.getLatestInstalledVersion(true);
}
return studioPatch;
}
private static void setUpRefProjectsStructure(PendoLoginProperties loginEvent) {
ProjectManager projectManager = ProjectManager.getInstance();
Project currentProject = projectManager.getCurrentProject();
@@ -162,7 +183,9 @@ public class PendoTrackDataUtil {
OPEN_IN_APITester("Open in API Tester"),
OPEN_API_DOCUMENTATION("Open API Documentation"),
AUTOMAP("tMap Automap"),
TMAP("tMap");
TMAP("tMap"),
ITEM_IMPORT("Import items"),
ITEM_SIGNATURE("Item Signature");
private String event;

View File

@@ -55,9 +55,9 @@ import org.talend.utils.json.JSONObject;
*/
public class PendoTrackSender {
private static final String PROP_PENDO_LOCAL_CHECK = "talend.pendo.localDebug";
public static final String PROP_PENDO_LOCAL_CHECK = "talend.pendo.localDebug";
private static final String PROP_PENDO_LOG_DATA = "talend.pendo.logRuntimeData";
public static final String PROP_PENDO_LOG_DATA = "talend.pendo.logRuntimeData";
private static final String PREFIX_API = "api";
@@ -79,13 +79,18 @@ public class PendoTrackSender {
private static String pendoInfo;
public PendoTrackSender() {
private PendoTrackSender() {
}
static {
instance = new PendoTrackSender();
RepositoryContext repositoryContext = getRepositoryContext();
if (repositoryContext != null) {
adminUrl = repositoryContext.getFields().get(RepositoryConstants.REPOSITORY_URL);
}
}
public static PendoTrackSender getInstance() {
if (instance == null) {
instance = new PendoTrackSender();
}
if (StringUtils.isBlank(adminUrl)) {
RepositoryContext repositoryContext = getRepositoryContext();
if (repositoryContext != null) {
@@ -118,7 +123,7 @@ public class PendoTrackSender {
public void sendTrackData(TrackEvent event, IPendoDataProperties properties) throws Exception {
if (isPendoLocalDebug()) {
ExceptionHandler.log(PendoTrackDataUtil.convertEntityJsonString(properties));
ExceptionHandler.log(event.getEvent() + ":" + PendoTrackDataUtil.convertEntityJsonString(properties));
return;
}
DefaultHttpClient client = null;

View File

@@ -36,6 +36,12 @@ public class PendoLoginProperties implements IPendoDataProperties {
@JsonProperty("referenced_projects")
private List<String> refProjectList;
@JsonProperty("one_click_login")
private String isOneClickLogin;
@JsonProperty("managed_update")
private String managedUpdate;
/**
* Getter for studio_version.
*
@@ -126,4 +132,40 @@ public class PendoLoginProperties implements IPendoDataProperties {
this.refProjectList = refProjectList;
}
/**
* Getter for isOneClickLogin.
*
* @return the isOneClickLogin
*/
public String getIsOneClickLogin() {
return isOneClickLogin;
}
/**
* Sets the isOneClickLogin.
*
* @param isOneClickLogin the isOneClickLogin to set
*/
public void setIsOneClickLogin(String isOneClickLogin) {
this.isOneClickLogin = isOneClickLogin;
}
/**
* Getter for managedUpdate.
*
* @return the managedUpdate
*/
public String getManagedUpdate() {
return managedUpdate;
}
/**
* Sets the managedUpdate.
*
* @param managedUpdate the managedUpdate to set
*/
public void setManagedUpdate(String managedUpdate) {
this.managedUpdate = managedUpdate;
}
}

View File

@@ -0,0 +1,232 @@
// ============================================================================
//
// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.core.pendo.properties;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* DOC jding class global comment. Detailled comment
*/
public class PendoSignImportProperties implements IPendoDataProperties {
@JsonProperty("source_version")
private List<String> sourceVersion;
@JsonProperty("studio_version")
private String studioVersion;
@JsonProperty("valid_items")
private int validItems;
@JsonProperty("unsigned_items_from_SE")
private String unsignSEItems;
@JsonProperty("unsigned_items_from_EE")
private int unsignEEItems;
@JsonProperty("grace_period")
private String gracePeriod;
@JsonProperty("installed_date")
private String installDate;
@JsonProperty("project_creation_date")
private String projectCreateDate;
@JsonProperty("valid_migration_token")
private String validMigrationToken;
@JsonProperty("import_product")
private List<String> importProduct;
/**
* Getter for sourceVersion.
* @return the sourceVersion
*/
public List<String> getSourceVersion() {
return sourceVersion;
}
/**
* Sets the sourceVersion.
* @param sourceVersion the sourceVersion to set
*/
public void setSourceVersion(List<String> sourceVersion) {
this.sourceVersion = sourceVersion;
}
/**
* Getter for studioVersion.
*
* @return the studioVersion
*/
public String getStudioVersion() {
return studioVersion;
}
/**
* Sets the studioVersion.
*
* @param studioVersion the studioVersion to set
*/
public void setStudioVersion(String studioVersion) {
this.studioVersion = studioVersion;
}
/**
* Getter for validItems.
*
* @return the validItems
*/
public int getValidItems() {
return validItems;
}
/**
* Sets the validItems.
*
* @param validItems the validItems to set
*/
public void setValidItems(int validItems) {
this.validItems = validItems;
}
/**
* Getter for unsignSEItems.
* @return the unsignSEItems
*/
public String getUnsignSEItems() {
return unsignSEItems;
}
/**
* Sets the unsignSEItems.
* @param unsignSEItems the unsignSEItems to set
*/
public void setUnsignSEItems(String unsignSEItems) {
this.unsignSEItems = unsignSEItems;
}
/**
* Getter for unsignEEItems.
*
* @return the unsignEEItems
*/
public int getUnsignEEItems() {
return unsignEEItems;
}
/**
* Sets the unsignEEItems.
*
* @param unsignEEItems the unsignEEItems to set
*/
public void setUnsignEEItems(int unsignEEItems) {
this.unsignEEItems = unsignEEItems;
}
/**
* Getter for gracePeriod.
*
* @return the gracePeriod
*/
public String getGracePeriod() {
return gracePeriod;
}
/**
* Sets the gracePeriod.
*
* @param gracePeriod the gracePeriod to set
*/
public void setGracePeriod(String gracePeriod) {
this.gracePeriod = gracePeriod;
}
/**
* Getter for installDate.
*
* @return the installDate
*/
public String getInstallDate() {
return installDate;
}
/**
* Sets the installDate.
*
* @param installDate the installDate to set
*/
public void setInstallDate(String installDate) {
this.installDate = installDate;
}
/**
* Getter for projectCreateDate.
*
* @return the projectCreateDate
*/
public String getProjectCreateDate() {
return projectCreateDate;
}
/**
* Sets the projectCreateDate.
*
* @param projectCreateDate the projectCreateDate to set
*/
public void setProjectCreateDate(String projectCreateDate) {
this.projectCreateDate = projectCreateDate;
}
/**
* Getter for validMigrationToken.
*
* @return the validMigrationToken
*/
public String getValidMigrationToken() {
return validMigrationToken;
}
/**
* Sets the validMigrationToken.
*
* @param validMigrationToken the validMigrationToken to set
*/
public void setValidMigrationToken(String validMigrationToken) {
this.validMigrationToken = validMigrationToken;
}
/**
* Getter for importProduct.
* @return the importProduct
*/
public List<String> getImportProduct() {
return importProduct;
}
/**
* Sets the importProduct.
* @param importProduct the importProduct to set
*/
public void setImportProduct(List<String> importProduct) {
this.importProduct = importProduct;
}
}

View File

@@ -0,0 +1,251 @@
// ============================================================================
//
// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.core.pendo.properties;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* DOC jding class global comment. Detailled comment
*/
public class PendoSignLogonProperties implements IPendoDataProperties {
@JsonProperty("studio_version")
private String studioVersion;
@JsonProperty("valid_items")
private int validItems;
@JsonProperty("signature_invalid_items")
private int invalidSignItems;
@JsonProperty("unsigned_items_from_SE")
private String unsignSEItems;
@JsonProperty("unsigned_items_from_EE")
private int unsignEEItems;
@JsonProperty("invalid_item_source_version")
private String invalidItemSourceVersion;
@JsonProperty("signed_by_migration")
private int signByMigration;
@JsonProperty("grace_period")
private String gracePeriod;
@JsonProperty("installed_date")
private String installDate;
@JsonProperty("project_creation_date")
private String projectCreateDate;
@JsonProperty("valid_migration_token")
private String validMigrationToken;
/**
* Getter for studioVersion.
*
* @return the studioVersion
*/
public String getStudioVersion() {
return studioVersion;
}
/**
* Sets the studioVersion.
*
* @param studioVersion the studioVersion to set
*/
public void setStudioVersion(String studioVersion) {
this.studioVersion = studioVersion;
}
/**
* Getter for validItems.
*
* @return the validItems
*/
public int getValidItems() {
return validItems;
}
/**
* Sets the validItems.
*
* @param validItems the validItems to set
*/
public void setValidItems(int validItems) {
this.validItems = validItems;
}
/**
* Getter for invalidSignItems.
*
* @return the invalidSignItems
*/
public int getInvalidSignItems() {
return invalidSignItems;
}
/**
* Sets the invalidSignItems.
*
* @param invalidSignItems the invalidSignItems to set
*/
public void setInvalidSignItems(int invalidSignItems) {
this.invalidSignItems = invalidSignItems;
}
/**
* Getter for unsignSEItems.
* @return the unsignSEItems
*/
public String getUnsignSEItems() {
return unsignSEItems;
}
/**
* Sets the unsignSEItems.
* @param unsignSEItems the unsignSEItems to set
*/
public void setUnsignSEItems(String unsignSEItems) {
this.unsignSEItems = unsignSEItems;
}
/**
* Getter for unsignEEItems.
*
* @return the unsignEEItems
*/
public int getUnsignEEItems() {
return unsignEEItems;
}
/**
* Sets the unsignEEItems.
*
* @param unsignEEItems the unsignEEItems to set
*/
public void setUnsignEEItems(int unsignEEItems) {
this.unsignEEItems = unsignEEItems;
}
/**
* Getter for invalidItemSourceVersion.
*
* @return the invalidItemSourceVersion
*/
public String getInvalidItemSourceVersion() {
return invalidItemSourceVersion;
}
/**
* Sets the invalidItemSourceVersion.
*
* @param invalidItemSourceVersion the invalidItemSourceVersion to set
*/
public void setInvalidItemSourceVersion(String invalidItemSourceVersion) {
this.invalidItemSourceVersion = invalidItemSourceVersion;
}
/**
* Getter for signByMigration.
*
* @return the signByMigration
*/
public int getSignByMigration() {
return signByMigration;
}
/**
* Sets the signByMigration.
*
* @param signByMigration the signByMigration to set
*/
public void setSignByMigration(int signByMigration) {
this.signByMigration = signByMigration;
}
/**
* Getter for gracePeriod.
*
* @return the gracePeriod
*/
public String getGracePeriod() {
return gracePeriod;
}
/**
* Sets the gracePeriod.
*
* @param gracePeriod the gracePeriod to set
*/
public void setGracePeriod(String gracePeriod) {
this.gracePeriod = gracePeriod;
}
/**
* Getter for installDate.
*
* @return the installDate
*/
public String getInstallDate() {
return installDate;
}
/**
* Sets the installDate.
*
* @param installDate the installDate to set
*/
public void setInstallDate(String installDate) {
this.installDate = installDate;
}
/**
* Getter for projectCreateDate.
*
* @return the projectCreateDate
*/
public String getProjectCreateDate() {
return projectCreateDate;
}
/**
* Sets the projectCreateDate.
*
* @param projectCreateDate the projectCreateDate to set
*/
public void setProjectCreateDate(String projectCreateDate) {
this.projectCreateDate = projectCreateDate;
}
/**
* Getter for validMigrationToken.
*
* @return the validMigrationToken
*/
public String getValidMigrationToken() {
return validMigrationToken;
}
/**
* Sets the validMigrationToken.
*
* @param validMigrationToken the validMigrationToken to set
*/
public void setValidMigrationToken(String validMigrationToken) {
this.validMigrationToken = validMigrationToken;
}
}

View File

@@ -91,13 +91,13 @@ public class PendoTMapProperties implements IPendoDataProperties {
* Number of input columns which are mapped to multiple output columns, either mapped directly or mapped through the
* Var column
*/
@JsonProperty("1-to-n mapping")
@JsonProperty("mapping_1_to_n")
private int oneToNMappings;
/**
* Number of output columns which have multiple source columns, either input columns or var columns
*/
@JsonProperty("n-to-1 mapping")
@JsonProperty("mapping_n_to_1")
private int nToOneMappings;
/**

View File

@@ -449,7 +449,7 @@ repository.rulesSql=SQL
repository.rulesParser=Parser
repository.rulesMatcher=Match
repository.systemIndicators=System Indicators
repository.userDefineIndicators=User Defined Indicators
repository.userDefineIndicators=User-defined Indicators
repository.userDefineIndicators.lib=lib
repository.systemIndicators.advancedStatistics=Advanced Statistics
repository.systemIndicators.businessRules=Business Rules
@@ -552,6 +552,8 @@ BusinessAppearanceComposite.textAlignment.vertical.centre=Centre
ConnectionBean.Local=Local
ConnectionBean.Remote=Remote
ConnectionBean.DefaultConnection=Default connection
ConnectionBean.Cloud.name=Signed in: Cloud ({0})
ConnectionBean.CloudConnection.description=Remote connection to Cloud - Signed in: Cloud ({0})
InegerCellEditorListener.NegativeNumberMessage=The value of {0} can't be set by negative number.
InegerCellEditorListener.NumeralMessage=The value of {0} should be numeral.
OpenXSDFileDialog.cancel=Cancel

View File

@@ -552,6 +552,8 @@ BusinessAppearanceComposite.textAlignment.vertical.centre=Centre
ConnectionBean.Local=Local
ConnectionBean.Remote=Distant
ConnectionBean.DefaultConnection=Connexion par d\u00E9faut
ConnectionBean.Cloud.name=Connect\u00E9(e) \u00E0\u00A0: Cloud ({0})
ConnectionBean.CloudConnection.description=Connexion distante au Cloud - Connect\u00E9(e) \u00E0\u00A0: Cloud ({0})
InegerCellEditorListener.NegativeNumberMessage=La valeur de {0} ne peut \u00EAtre un nombre n\u00E9gatif.
InegerCellEditorListener.NumeralMessage=La valeur de {0} doit \u00EAtre num\u00E9rique.
OpenXSDFileDialog.cancel=Annuler
@@ -575,7 +577,7 @@ repository.servicesPort=Port
BinRepositoryNode.label=Corbeille
HDFS=HDFS
HCAT=HCAT
AbstractRepositoryContentHandler.deleteNode.exception=\u00C9chec de la suppression des pertinences de noeud\u00A0: {0}
AbstractRepositoryContentHandler.deleteNode.exception=\u00C9chec de la suppression des pertinences de n\u0153ud\u00A0: {0}
HadoopCustomVersionDialog.topTitle=D\u00E9finition de la version Hadoop personnalis\u00E9e
HadoopCustomVersionDialog.title=D\u00E9finir la distribution Hadoop personnalis\u00E9e
HadoopCustomVersionDialog.msg=Configurer les biblioth\u00E8ques n\u00E9cessaires \u00E0 la version personnalis\u00E9e de Hadoop

View File

@@ -184,7 +184,7 @@ AbstractTalendFunctionParser.checkMethod=\u30EB\u30FC\u30C1\u30F3: "{0}.{1}\\"\u
JavaGlobalVariableProposal.Description=\u8AAC\u660E: {0}
JavaGlobalVariableProposal.VariableName=\n\n\u5909\u6570\u540D: {1}
JavaSimpleDateFormatProposalProvider.displaySingleQuote= ' : \u4E00\u91CD\u5F15\u7528\u7B26\u3092\u8868\u793A
JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3067\uFF11\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3092\u793A\u3057\u307E\u3059\u3002
JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3067\uFF11\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3092\u793A\u3057\u307E\u3059\u3002
JavaTypesManager.bigDecimal=BIGDECIMAL\u306F\u6570\u5024\u3067\u3059:
JavaTypesManager.integer=INTEGER\u306F\u6570\u5024\u3067\u3059:
JavaTypesManager.list=LIST\u306F\u6570\u5024\u3067\u3059:
@@ -449,7 +449,7 @@ repository.rulesSql=SQL
repository.rulesParser=\u30D1\u30FC\u30B5\u30FC
repository.rulesMatcher=\u4E00\u81F4
repository.systemIndicators=\u30B7\u30B9\u30C6\u30E0\u30A4\u30F3\u30C7\u30A3\u30B1\u30FC\u30BF\u30FC
repository.userDefineIndicators=\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u30A4\u30F3\u30B8\u30B1\u30FC\u30BF\u30FC
repository.userDefineIndicators=\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u306E\u30A4\u30F3\u30B8\u30B1\u30FC\u30BF\u30FC
repository.userDefineIndicators.lib=lib
repository.systemIndicators.advancedStatistics=\u8A73\u7D30\u7D71\u8A08
repository.systemIndicators.businessRules=\u30D3\u30B8\u30CD\u30B9\u30EB\u30FC\u30EB
@@ -552,6 +552,8 @@ BusinessAppearanceComposite.textAlignment.vertical.centre=\u4E2D\u5FC3
ConnectionBean.Local=\u30ED\u30FC\u30AB\u30EB
ConnectionBean.Remote=\u30EA\u30E2\u30FC\u30C8
ConnectionBean.DefaultConnection=\u30C7\u30D5\u30A9\u30EB\u30C8\u63A5\u7D9A
ConnectionBean.Cloud.name=\u30B5\u30A4\u30F3\u30A4\u30F3\u6E08\u307F: \u30AF\u30E9\u30A6\u30C9({0})
ConnectionBean.CloudConnection.description=\u30AF\u30E9\u30A6\u30C9\u3078\u306E\u30EA\u30E2\u30FC\u30C8\u63A5\u7D9A - \u30B5\u30A4\u30F3\u30A4\u30F3\u6E08\u307F: \u30AF\u30E9\u30A6\u30C9({0})
InegerCellEditorListener.NegativeNumberMessage={0}\u306B\u306F\u8CA0\u306E\u5024\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
InegerCellEditorListener.NumeralMessage={0}\u306B\u306F\u6570\u5024\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
OpenXSDFileDialog.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB

View File

@@ -552,6 +552,8 @@ BusinessAppearanceComposite.textAlignment.vertical.centre=\u4E2D\u592E
ConnectionBean.Local=\u672C\u5730
ConnectionBean.Remote=\u8FDC\u7A0B
ConnectionBean.DefaultConnection=\u9ED8\u8BA4\u8FDE\u63A5
ConnectionBean.Cloud.name=\u5DF2\u767B\u5F55: \u4E91\u7AEF ({0})
ConnectionBean.CloudConnection.description=\u4E91\u7AEF\u8FDC\u7A0B\u8FDE\u63A5 - \u5DF2\u767B\u5F55: \u4E91\u7AEF ({0})
InegerCellEditorListener.NegativeNumberMessage={0} \u7684\u503C\u4E0D\u80FD\u8BBE\u5B9A\u4E3A\u8D1F\u6570\u3002
InegerCellEditorListener.NumeralMessage={0} \u7684\u503C\u5E94\u8BE5\u4E3A\u6570\u5B57\u3002
OpenXSDFileDialog.cancel=\u53D6\u6D88

View File

@@ -19,7 +19,9 @@ package org.talend.core.runtime.maven;
public interface MavenConstants {
static final String NAME_GROUP_ID = "GROUP_ID";
static final String CLOUD_VERSION = "CLOUD_VERSION";
static final String NAME_USER_VERSION = "USER_VERSION";
static final String NAME_PUBLISH_AS_SNAPSHOT = "PUBLISH_AS_SNAPSHOT";

View File

@@ -78,5 +78,10 @@ public interface IProjectSettingPreferenceConstants {
public static final String TEMPLATE_DOCKER_PROFILE_POM = "template_docker_profile_pom_script"; //$NON-NLS-1$
public static final String USE_STRICT_REFERENCE_JOBLET = "use_strict_reference_joblet"; //$NON-NLS-1$
/*
* Default microservices application properties
*/
public static final String MS_APPLICATION_PROPERTIES = "ms_application_properties";
}

View File

@@ -19,6 +19,8 @@ package org.talend.core.runtime.projectsetting;
public interface IProjectSettingTemplateConstants {
final static String PATH_RESOURCES = "resources";
final static String PATH_APPLICATION_PROPERTIES = PATH_RESOURCES + '/' + "application.properties";
final static String PATH_RESOURCES_TEMPLATES = PATH_RESOURCES + '/' + "templates";

View File

@@ -0,0 +1,171 @@
// ============================================================================
//
// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.core.runtime.util;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.Collections;
import java.util.HashSet;
import java.util.Optional;
import java.util.Properties;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.log4j.Logger;
import org.eclipse.core.runtime.Platform;
import org.eclipse.emf.common.util.EList;
import org.osgi.framework.Bundle;
import org.talend.commons.CommonsPlugin;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.commons.utils.generation.JavaUtils;
import org.talend.core.model.general.Project;
import org.talend.core.model.process.EParameterFieldType;
import org.talend.core.model.process.JobInfo;
import org.talend.core.model.properties.JobletProcessItem;
import org.talend.core.model.properties.ProcessItem;
import org.talend.core.model.properties.Property;
import org.talend.core.runtime.CoreRuntimePlugin;
import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
import org.talend.designer.runprocess.IProcessor;
import org.talend.repository.ProjectManager;
public class ModuleAccessHelper {
private static final String FORMAT_ADD_OPPENS = "--add-opens=@=ALL-UNNAMED"; //$NON-NLS-1$
private static final Logger LOGGER = Logger.getLogger(ModuleAccessHelper.class);
private static final Properties PROPS = new Properties();
static {
Bundle bundle = Platform.getBundle(CoreRuntimePlugin.PLUGIN_ID);
URL templateUrl = bundle.getEntry("resources/module_access.properties"); //$NON-NLS-1$
try (InputStream input = templateUrl.openStream()) {
PROPS.load(input);
} catch (IOException e) {
ExceptionHandler.process(e);
}
}
private static boolean containsKey(String key) {
return PROPS.containsKey(key);
}
private static Set<String> getModules(String key) {
String modules = PROPS.getProperty(key);
if (modules != null) {
return Stream.of(modules.split(",")).map(module -> FORMAT_ADD_OPPENS.replace("@", module)) //$NON-NLS-1$ //$NON-NLS-2$
.collect(Collectors.toSet());
}
return Collections.emptySet();
}
private static boolean allowJavaInternalAcess(Property property) {
boolean isJava17 = false;
String javaVersion = System.getProperty("java.version"); //$NON-NLS-1$
String[] arr = javaVersion.split("\\.");
try {
isJava17 = Integer.parseInt(arr[0]) >= 17;
} catch (NumberFormatException e) {
LOGGER.error("Failed to parse java.version: " + javaVersion); //$NON-NLS-1$
isJava17 = false;
}
if (isJava17) {
String allow = System.getProperty(JavaUtils.ALLOW_JAVA_INTERNAL_ACCESS);
if (allow != null) {
return Boolean.valueOf(allow);
}
if (CommonsPlugin.isTUJTest()) {
return true;
}
Project project;
if (property != null) {
project = ProjectManager.getInstance()
.getProjectFromProjectTechLabel(ProjectManager.getInstance().getProject(property).getTechnicalLabel());
} else {
project = ProjectManager.getInstance().getCurrentProject();
}
ProjectPreferenceManager preferenceManager = new ProjectPreferenceManager(project, CoreRuntimePlugin.PLUGIN_ID,
false);
return preferenceManager.getBoolean(JavaUtils.ALLOW_JAVA_INTERNAL_ACCESS);
}
return false;
}
public static Set<String> getModuleAccessVMArgsForProcessor(IProcessor processor) {
Property property = processor.getProperty();
if (property == null || property.getItem() == null || !allowJavaInternalAcess(property)) {
return Collections.emptySet();
}
ProcessItem mainJobItem = (ProcessItem) property.getItem();
Set<JobInfo> allJobInfos = new HashSet<>();
allJobInfos.add(new JobInfo(mainJobItem, mainJobItem.getProcess().getDefaultContext()));
allJobInfos.addAll(processor.getBuildChildrenJobsAndJoblets());
return ModuleAccessHelper.getModuleAccessVMArgs(property, allJobInfos);
}
@SuppressWarnings("unchecked")
public static Set<String> getModuleAccessVMArgs(Property property, Set<JobInfo> allJobInfos) {
if (property == null || property.getItem() == null || !allowJavaInternalAcess(property)) {
return Collections.emptySet();
}
Set<String> vmArgs = new HashSet<>();
boolean hasTck = false;
for (JobInfo info : allJobInfos) {
EList<NodeType> nodes = null;
EList<ElementParameterType> parameters = null;
if (info.getJobletProperty() != null) {
JobletProcessItem item = (JobletProcessItem) info.getJobletProperty().getItem();
if (item.getJobletProcess() != null) {
nodes = item.getJobletProcess().getNode();
if (item.getJobletProcess().getParameters() != null) {
parameters = item.getJobletProcess().getParameters().getElementParameter();
}
}
} else if (info.getProcessItem() != null && info.getProcessItem().getProcess() != null) {
nodes = info.getProcessItem().getProcess().getNode();
if (info.getProcessItem().getProcess().getParameters() != null) {
parameters = info.getProcessItem().getProcess().getParameters().getElementParameter();
}
}
if (nodes != null) {
nodes.stream().filter(node -> containsKey(node.getComponentName()))
.forEach(node -> vmArgs.addAll(getModules(node.getComponentName())));
}
if (parameters != null) {
// FIXME currently it depends on spark version, refine the condition if needed
Optional<ElementParameterType> optional = parameters.stream()
.filter(p -> "SUPPORTED_SPARK_VERSION".equals(p.getName()) && containsKey(p.getValue())).findFirst();
if (optional.isPresent()) {
vmArgs.addAll(getModules(optional.get().getValue()));
}
}
if (!hasTck) {
hasTck = nodes.stream()
.anyMatch(node -> node.getElementParameter().stream()
.anyMatch(p -> ((ElementParameterType) p).getField() != null
&& EParameterFieldType.TECHNICAL.getName().equals(((ElementParameterType) p).getField())
&& ((ElementParameterType) p).getName().equals("TACOKIT_COMPONENT_ID")));
}
}
if (hasTck) {
vmArgs.addAll(getModules("TCK_COMMON_ARGS"));
}
return vmArgs;
}
}

View File

@@ -0,0 +1,58 @@
// ============================================================================
//
// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.core.service;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.IService;
import org.talend.signon.util.TokenMode;
import org.talend.signon.util.listener.LoginEventListener;
public interface ICloudSignOnService extends IService {
TokenMode getToken(String authCode, String codeVerifier, String dataCenter) throws Exception;
void startHeartBeat() throws Exception;
void stopHeartBeat();
String generateCodeVerifier();
String getCodeChallenge(String seed) throws Exception;
boolean hasValidToken() throws Exception;
String getTokenUser(String url, TokenMode token) throws Exception;
void signonCloud(LoginEventListener listener) throws Exception;
TokenMode getLatestToken() throws Exception;
public boolean refreshToken() throws Exception;
boolean isSignViaCloud();
boolean isNeedShowSSOPage();
public void showReloginDialog();
public boolean isReloginDialogRunning();
public void reload();
public static ICloudSignOnService get() {
if (GlobalServiceRegister.getDefault().isServiceRegistered(ICloudSignOnService.class)) {
return GlobalServiceRegister.getDefault().getService(ICloudSignOnService.class);
}
return null;
}
}

View File

@@ -30,4 +30,6 @@ public interface IDesignerXMLMapperService extends IService {
*/
public boolean isVirtualComponent(final INode node);
public Object rebuildXmlMapData(final INode node);
}

View File

@@ -128,6 +128,12 @@ public interface IStudioLiteP2Service extends IService {
void setupTmcUpdate(IProgressMonitor monitor, IStudioUpdateConfig updateConfig) throws Exception;
boolean removeM2() throws Exception;
void saveRemoveM2(boolean remove) throws Exception;
void cleanM2(IProgressMonitor monitor);
public static IStudioLiteP2Service get() {
if (GlobalServiceRegister.getDefault().isServiceRegistered(IStudioLiteP2Service.class)) {
return GlobalServiceRegister.getDefault().getService(IStudioLiteP2Service.class);

View File

@@ -81,6 +81,8 @@ public interface ITestContainerProviderService extends IService {
public List<ProcessItem> getAllTestContainers(ProcessItem item);
public List<ProcessItem> getAllTestContainers(ProcessItem item, boolean latest, boolean excludeDeleted);
public void copyDataSetFiles(IProcess process, IPath srcPath);
public String getTestDataValue(IProcess process, String instance, String testData);

View File

@@ -160,6 +160,8 @@ public interface IRunProcessService extends IService {
public void checkLastGenerationHasCompilationError(boolean updateProblemsView) throws ProcessorException;
public void checkLastGenerationHasCompilationError(boolean updateProblemsView, boolean isJob) throws ProcessorException;
/**
* DOC ycbai Comment method "getResourceFilePath".
*

View File

@@ -32,6 +32,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.ui.PlatformUI;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.core.model.general.ConnectionBean;
import org.talend.core.service.ICloudSignOnService;
import org.talend.utils.json.JSONArray;
import org.talend.utils.json.JSONException;
import org.talend.utils.json.JSONObject;
@@ -158,6 +159,8 @@ public class ConnectionUserPerReader {
}
if (cons == null || cons.size() == 0) {
proper.remove("connection.users");//$NON-NLS-1$
proper.remove("connection.define");//$NON-NLS-1$
proper.remove("connection.lastConnection");//$NON-NLS-1$
} else {
JSONArray usersJsonArray = new JSONArray();
for (ConnectionBean currentConnection : cons) {
@@ -207,7 +210,6 @@ public class ConnectionUserPerReader {
} catch (Exception e) {
e.printStackTrace();
}
}
public void createPropertyFile() {

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Core UI Plug-in
Bundle-SymbolicName: org.talend.core.ui;singleton:=true
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.8.8.qualifier
Require-Bundle: org.apache.commons.lang,
org.apache.commons.collections,
org.eclipse.gef;visibility:=reexport,

View File

@@ -9,6 +9,7 @@ bin.includes = .,\
lib/jna-platform.jar,\
lib/jna.jar,\
lib/oshi-core.jar,\
plugin_en.properties,\
plugin_fr.properties,\
plugin_ja.properties,\
plugin_sk.properties,\

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.ui</artifactId>

View File

@@ -133,7 +133,7 @@ JavaFunctionParser.checkMethod=\u30EB\u30FC\u30C1\u30F3: "{0}.{1}"\u89E3\u6790\u
JavaGlobalVariableProposal.Description=\u8AAC\u660E: {0}
JavaGlobalVariableProposal.VariableName=\n\n\u5909\u6570\u540D: {1}
JavaSimpleDateFormatProposalProvider.displaySingleQuote= ' : \u4E00\u91CD\u5F15\u7528\u7B26\u3092\u8868\u793A
JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3067\uFF11\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3092\u793A\u3057\u307E\u3059\u3002
JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3067\uFF11\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3092\u793A\u3057\u307E\u3059\u3002
JavaTypesManager.bigDecimal=BIGDECIMAL\u306F\u6570\u5024\u3067\u3059:
JavaTypesManager.integer=INTEGER\u306F\u6570\u5024\u3067\u3059:
JavaTypesManager.list=LIST\u306F\u6570\u5024\u3067\u3059:

View File

@@ -3,7 +3,7 @@ Automatic-Module-Name: org.talend.core
Bundle-ManifestVersion: 2
Bundle-Name: Core Plug-in
Bundle-SymbolicName: org.talend.core;singleton:=true
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.8.8.qualifier
Bundle-Activator: org.talend.core.CorePlugin
Bundle-Localization: plugin
Eclipse-LazyStart: true

View File

@@ -9,6 +9,7 @@ bin.includes = META-INF/,\
schema/,\
lib/,\
plugin_de.properties,\
plugin_en.properties,\
plugin_es.properties,\
plugin_fr.properties,\
plugin_it.properties,\

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core</artifactId>

View File

@@ -115,7 +115,7 @@ GlobalServiceRegister.ServiceNotRegistered=\u30B5\u30FC\u30D3\u30B9{0}\u304C\u76
GroupByContextAction.groupContext=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3054\u3068\u306B\u30B0\u30EB\u30FC\u30D4\u30F3\u30B0
GroupByVariableAction.groupVariable=\u5909\u6570\u3054\u3068\u306B\u30B0\u30EB\u30FC\u30D4\u30F3\u30B0
JavaSimpleDateFormatProposalProvider.displaySingleQuote= ' : \u4E00\u91CD\u5F15\u7528\u7B26\u3092\u8868\u793A
JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3067\uFF11\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3092\u793A\u3057\u307E\u3059\u3002
JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3067\uFF11\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3092\u793A\u3057\u307E\u3059\u3002
JavaTypesManager.bigDecimal=BIGDECIMAL\u306F\u6570\u5024\u3067\u3059:
JavaTypesManager.integer=INTEGER\u306F\u6570\u5024\u3067\u3059:
JavaTypesManager.list=LIST\u306F\u6570\u5024\u3067\u3059:

View File

@@ -42,6 +42,7 @@ import org.talend.core.model.metadata.builder.ConvertionHelper;
import org.talend.core.model.metadata.builder.connection.MetadataTable;
import org.talend.core.model.process.ElementParameterParser;
import org.talend.core.model.properties.Item;
import org.talend.core.model.properties.Property;
import org.talend.core.model.relationship.RelationshipItemBuilder;
import org.talend.core.model.repository.IRepositoryViewObject;
import org.talend.core.model.repository.RepositoryManager;
@@ -56,6 +57,7 @@ import org.talend.core.model.utils.TalendTextUtils;
import org.talend.core.prefs.PreferenceManipulator;
import org.talend.core.repository.model.ProxyRepositoryFactory;
import org.talend.core.runtime.process.ITalendProcessJavaProject;
import org.talend.core.services.ICoreTisService;
import org.talend.core.services.IJobCheckService;
import org.talend.core.utils.KeywordsValidator;
import org.talend.designer.codegen.ICodeGeneratorService;
@@ -400,4 +402,31 @@ public class CoreService implements ICoreService {
}
});
}
@Override
public Integer getSignatureVerifyResult(Property property, IPath resourcePath, boolean considerGP) throws Exception {
ICoreTisService coreTisService = ICoreTisService.get();
if (coreTisService != null) {
return coreTisService.getSignatureVerifyResult(property, resourcePath, considerGP);
}
return null;
}
@Override
public String getLicenseCustomer() {
ICoreTisService coreTisService = ICoreTisService.get();
if (coreTisService != null) {
return coreTisService.getLicenseCustomer();
}
return null;
}
@Override
public boolean isInValidGP() {
ICoreTisService coreTisService = ICoreTisService.get();
if (coreTisService != null) {
return coreTisService.isInValidGP();
}
return false;
}
}

View File

@@ -21,6 +21,7 @@ import org.talend.commons.exception.PersistenceException;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.model.components.conversions.IComponentConversion;
import org.talend.core.model.components.conversions.RenameComponentConversion;
import org.talend.core.model.components.conversions.DefaultRenameComponentConversion;
import org.talend.core.model.components.filters.IComponentFilter;
import org.talend.core.model.components.filters.NameComponentFilter;
import org.talend.core.model.properties.Item;
@@ -56,6 +57,20 @@ public class ModifyComponentsAction {
throws PersistenceException {
searchAndModify(item, item.getProcess(), filter, conversions);
}
/**
* Rename component name
* @param item job item
* @param processType Process type
* @param oldName old base name, for tck component, name does not include prefix "t", while for non tck components, name includes prefix "t".
* @param newName new base name, for tck component, name does not include prefix "t", while for non tck components, name includes prefix "t".
* @return
* @throws PersistenceException
*/
public static boolean searchAndRenameComponent(Item item, ProcessType processType, String oldName, String newName) throws PersistenceException {
return searchAndModify(item, processType, new NameComponentFilter(oldName), Arrays.<IComponentConversion> asList(new DefaultRenameComponentConversion(oldName, newName)));
}
public static boolean searchAndModify(Item item, ProcessType processType, IComponentFilter filter,
List<IComponentConversion> conversions) throws PersistenceException {

View File

@@ -0,0 +1,118 @@
// ============================================================================
//
// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.core.model.components.conversions;
import org.eclipse.emf.common.util.EList;
import org.talend.commons.runtime.model.components.IComponentConstants;
import org.talend.core.model.components.ComponentUtilities;
import org.talend.designer.core.model.utils.emf.talendfile.ConnectionType;
import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
import org.talend.designer.core.model.utils.emf.talendfile.MetadataType;
import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
import org.talend.designer.core.model.utils.emf.talendfile.SubjobType;
/**
* @author bhe created on Jul 6, 2022
*
*/
public class DefaultRenameComponentConversion implements IComponentConversion {
private String newName;
private String oldName;
/**
* Rename component name
*
* @param oldName old base name of the component, e.g. NetSuiteV2019Input
* @param newName new base name of the component, e.g. NetSuiteNewInput
*/
public DefaultRenameComponentConversion(String oldName, String newName) {
super();
this.newName = newName;
this.oldName = oldName;
}
public void transform(NodeType node) {
node.setComponentName(newName);
ProcessType item = (ProcessType) node.eContainer();
String oldNodeUniqueName = ComponentUtilities.getNodeUniqueName(node);
ComponentUtilities.setNodeUniqueName(node, oldNodeUniqueName.replaceAll(oldName, newName));
replaceAllInAllNodesParameterValue(item, this.oldName, this.newName);
}
protected static void replaceAllInAllNodesParameterValue(ProcessType item, String oldName, String newName) {
for (Object o : item.getNode()) {
NodeType nt = (NodeType) o;
ComponentUtilities.replaceInNodeParameterValue(nt, oldName, newName);
EList metaList = nt.getMetadata();
if (metaList != null) {
if (!metaList.isEmpty()) {
for (Object obj : metaList) {
MetadataType meta = (MetadataType) obj;
if (meta.getName().contains(oldName)) {
meta.setName(meta.getName().replaceAll(oldName, newName));
}
}
}
}
}
for (Object o : item.getConnection()) {
ConnectionType currentConnection = (ConnectionType) o;
if (currentConnection.getSource().contains(oldName)) {
currentConnection.setSource(currentConnection.getSource().replaceAll(oldName, newName));
}
if (currentConnection.getTarget().contains(oldName)) {
currentConnection.setTarget(currentConnection.getTarget().replaceAll(oldName, newName));
}
if (currentConnection.getMetaname().contains(oldName)) {
currentConnection.setMetaname(currentConnection.getMetaname().replaceAll(oldName, newName));
}
if ("RUN_IF".equals(currentConnection.getConnectorName())) {
for (Object obj : currentConnection.getElementParameter()) {
ElementParameterType type = (ElementParameterType) obj;
if ("CONDITION".equals(type.getName())) {
if (type.getValue() != null && type.getValue().contains(oldName)) {
String replaceAll = type.getValue().replaceAll(oldName, newName);
type.setValue(replaceAll);
}
break;
}
}
}
}
for (Object o : item.getSubjob()) {
SubjobType sj = (SubjobType) o;
for (Object obj : sj.getElementParameter()) {
ElementParameterType p = (ElementParameterType) obj;
if (p.getName().equals(IComponentConstants.UNIQUE_NAME)) {
if (p.getValue() != null && p.getValue().contains(oldName)) {
String replaceAll = p.getValue().replaceAll(oldName, newName);
p.setValue(replaceAll);
}
}
}
}
}
public String getNewName() {
return this.newName;
}
public void setNewName(String newName) {
this.newName = newName;
}
}

View File

@@ -1,86 +1,103 @@
// ============================================================================
//
// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.core.prefs;
import java.util.Arrays;
import java.util.ResourceBundle;
import org.talend.commons.i18n.MessagesCore;
/**
* Use to retrieve general application parameters.<br/>
*
* $Id: Messages.java 1 2006-09-29 17:06:40 +0000 (ven., 29 sept. 2006) nrousseau $
*
*/
public class GeneralParametersProvider extends MessagesCore {
private static final String BUNDLE_NAME = "parameters"; //$NON-NLS-1$
private static final String PLUGIN_ID = "org.talend.core"; //$NON-NLS-1$
private static ResourceBundle resourceBundle;
private static ResourceBundle getBundle() {
if (resourceBundle == null) {
try {
resourceBundle = ResourceBundle.getBundle(BUNDLE_NAME);
} catch (Exception e) {
// Nothing to do (return null)
}
}
return resourceBundle;
}
/**
* Returns the value corresponding to the specified key.
*/
public static String getString(GeneralParameters key) {
return getString(key.getParamName(), PLUGIN_ID, getBundle());
}
/**
* Returns a sorted string array containing values corresponding to the specified key.
*/
public static String[] getStrings(GeneralParameters key) {
String value = getString(key);
String[] toReturn = value.split(","); //$NON-NLS-1$
Arrays.sort(toReturn);
return toReturn;
}
/**
* DOC smallet GeneralParametersProvider class global comment. Detailled comment <br/>
*
* $Id$
*/
public enum GeneralParameters {
AUTHORIZED_LANGUAGE("param.authorizedlanguage"), //$NON-NLS-1$
DEFAULT_PERL_INTERPRETER_WIN32("param.defaultPerlInterpreterPath.win32"), //$NON-NLS-1$
DEFAULT_PERL_INTERPRETER_LINUX("param.defaultPerlInterpreterPath.linux"), //$NON-NLS-1$
DEFAULT_PERL_INTERPRETER_EMBEDDED_SUFFIX_WIN32("param.defaultPerlInterpreterEmbeddedSuffix.win32"), //$NON-NLS-1$
DEFAULT_JAVA_INTERPRETER_SUFFIX_WIN32("param.defaultJavaInterpreterSuffix.win32"), //$NON-NLS-1$
DEFAULT_JAVA_INTERPRETER_SUFFIX_LINUX("param.defaultJavaInterpreterSuffix.linux"), //$NON-NLS-1$
PROJECTS_EXCLUDED_FROM_EXPORT("param.projectsExcludedFromExport"); //$NON-NLS-1$
private String paramName;
GeneralParameters(String paramName) {
this.paramName = paramName;
}
public String getParamName() {
return this.paramName;
}
}
}
// ============================================================================
//
// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.core.prefs;
import java.util.Arrays;
import java.util.Locale;
import java.util.ResourceBundle;
import org.apache.commons.lang3.StringUtils;
import org.talend.commons.i18n.MessagesCore;
import org.talend.core.CorePlugin;
/**
* Use to retrieve general application parameters.<br/>
*
* $Id: Messages.java 1 2006-09-29 17:06:40 +0000 (ven., 29 sept. 2006) nrousseau $
*
*/
public class GeneralParametersProvider extends MessagesCore {
private static final String BUNDLE_NAME = "parameters"; //$NON-NLS-1$
private static final String PLUGIN_ID = "org.talend.core"; //$NON-NLS-1$
private static ResourceBundle resourceBundle;
private static ResourceBundle getBundle() {
if (resourceBundle == null) {
try {
resourceBundle = ResourceBundle.getBundle(BUNDLE_NAME);
} catch (Exception e) {
// Nothing to do (return null)
}
}
return resourceBundle;
}
/**
* Returns the value corresponding to the specified key.
*/
public static String getString(GeneralParameters key) {
return getString(key.getParamName(), PLUGIN_ID, getBundle());
}
/**
* Returns a sorted string array containing values corresponding to the specified key.
*/
public static String[] getStrings(GeneralParameters key) {
String value = getString(key);
String[] toReturn = value.split(","); //$NON-NLS-1$
Arrays.sort(toReturn);
return toReturn;
}
public static String getOnLineHelpLanguageSetting() {
String language = CorePlugin.getDefault().getPluginPreferences().getString(ITalendCorePrefConstants.LANGUAGE_SELECTOR);
if (StringUtils.isBlank(language)) {
language = Locale.getDefault().getLanguage();
}
if (Locale.FRENCH.getLanguage().equals(language)) {
return "fr";
}
if (Locale.JAPAN.getLanguage().equals(language)) {
return "ja";
}
return "en"; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
* DOC smallet GeneralParametersProvider class global comment. Detailled comment <br/>
*
* $Id$
*/
public enum GeneralParameters {
AUTHORIZED_LANGUAGE("param.authorizedlanguage"), //$NON-NLS-1$
DEFAULT_PERL_INTERPRETER_WIN32("param.defaultPerlInterpreterPath.win32"), //$NON-NLS-1$
DEFAULT_PERL_INTERPRETER_LINUX("param.defaultPerlInterpreterPath.linux"), //$NON-NLS-1$
DEFAULT_PERL_INTERPRETER_EMBEDDED_SUFFIX_WIN32("param.defaultPerlInterpreterEmbeddedSuffix.win32"), //$NON-NLS-1$
DEFAULT_JAVA_INTERPRETER_SUFFIX_WIN32("param.defaultJavaInterpreterSuffix.win32"), //$NON-NLS-1$
DEFAULT_JAVA_INTERPRETER_SUFFIX_LINUX("param.defaultJavaInterpreterSuffix.linux"), //$NON-NLS-1$
PROJECTS_EXCLUDED_FROM_EXPORT("param.projectsExcludedFromExport"); //$NON-NLS-1$
private String paramName;
GeneralParameters(String paramName) {
this.paramName = paramName;
}
public String getParamName() {
return this.paramName;
}
}
}

View File

@@ -18,6 +18,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.common.util.URI;
import org.osgi.service.prefs.BackingStoreException;
@@ -84,9 +85,25 @@ public interface ICoreTisService extends IService {
public void afterImport (Property property) throws PersistenceException;
Integer getSignatureVerifyResult(Property property, IPath resourcePath, boolean considerGP) throws Exception;
String getLicenseCustomer();
void storeLicenseAndUpdateConfig(String licenseString) throws IOException;
boolean isInValidGP();
boolean hasNewPatchInPatchesFolder();
boolean isDefaultLicenseAndProjectType();
String getLicenseProductName(String licenseString) throws Exception;
String getLicenseProductEdition(String licenseString) throws Exception;
boolean isLicenseExpired(String licenseString) throws Exception;
boolean isLicenseVersionCorrect(String licenseString) throws Exception;
void syncProjectUpdateSettingsFromServer(IProgressMonitor monitor, Project proj) throws Exception;

Some files were not shown because too many files have changed in this diff Show More