Compare commits

...

183 Commits

Author SHA1 Message Date
Chao MENG
163e0d70ec chore: support export item 2022-09-19 00:46:30 +08:00
Chao MENG
6800625fe9 chore: support code generator server 2022-09-15 17:42:18 +08:00
vyu-talend
a6190d6896 fix(TDI-48213):fix the risk of not closing resources (#7922)
* fix(TDI-48213):fix the closing resources issues. (#7826)

* fix(TDI-48213):fix the closing resources issues.

* fix(TDI-48213):change the log level.

* fix(TDI-48213):fix the risk of not closing resources.

* fix(TDI-48213):remove useless try/catch.

* feat(TDI-42323):add entry to custom ratio.

* Revert "feat(TDI-42323):add entry to custom ratio."

This reverts commit 18e23af73c.

* fix(TDI-48213):add finish flag to end and finally.

* fix(TDI-48213):remove useless codes.

Co-authored-by: vyu <vyu@192.168.1.15>
2022-09-15 16:33:45 +08:00
Dmytro Grygorenko
1f5a3f62d8 feat(TDI-46676): MDC logging for Log4J. (#7702)
* feat(TDI-46676): MDC logging for Log4J.

* feat(TDI-46676): implement for Log4J2 only.

* feat(TDI-46676): formatting, duplicate entries removed.

* feat(TDI-46676): restoring after rebase.

* feat(TDI-46676): fix after rebase.

* feat(TDI-46676): add content of jobInfo.properties

* fix(TDI-46676): corrections after rebase.

* feat(TDI-46676): typos.

* feat(TDI-46676): changes after code review.
2022-09-14 16:11:56 +03:00
Jane Ding
56577d508b fix(TUP-36251):[8.0.1] File JSON metadata not working when special character or space is available in the field name (#7992)
* fix(TUP-36251):[8.0.1] File JSON metadata not working when special (#7939)

* fix(TUP-36251):[8.0.1] File JSON metadata not working when special
character or space is available in the field name
https://jira.talendforge.org/browse/TUP-36251

* fix(TUP-36251):[8.0.1] File JSON metadata not working when special
character or space is available in the field name
https://jira.talendforge.org/browse/TUP-36251

* fix(TUP-36251):[8.0.1] File JSON metadata not working when special
character or space is available in the field name
https://jira.talendforge.org/browse/TUP-36251

* fix(TUP-36251):[8.0.1] File JSON metadata not working when special
character or space is available in the field name
https://jira.talendforge.org/browse/TUP-36251

* fix(TUP-36251):[8.0.1] File JSON metadata not working when special
character or space is available in the field name
https://jira.talendforge.org/browse/TUP-36251

* fix(TUP-36251):[8.0.1] File JSON metadata not working when special
character or space is available in the field name
https://jira.talendforge.org/browse/TUP-36251

* fix(TUP-36251):[8.0.1] File JSON metadata not working when special
character or space is available in the field name
https://jira.talendforge.org/browse/TUP-36251

* fix(TUP-36251):[8.0.1] File JSON metadata not working when special
character or space is available in the field name
https://jira.talendforge.org/browse/TUP-36251

* fix(TUP-36251):[8.0.1] File JSON metadata not working when special
character or space is available in the field name
https://jira.talendforge.org/browse/TUP-36251

* fix(TUP-36251):[8.0.1] File JSON metadata not working when special
character or space is available in the field name
https://jira.talendforge.org/browse/TUP-36251
2022-09-14 20:15:55 +08:00
Liu Xinquan
a5ad384e46 Revert "fix(TDQ-20610) org.apache.lucene:lucene-core (#7944)" (#7982)
This reverts commit 8ea780dc4d.
2022-09-13 17:47:58 +08:00
AlixMetivier
4e9e4e0290 feat(TBD-13647): allow switch from transient to interactive cluster (#7713) (#7971)
* feat(TBD-13647): allow switch from transient to interactive cluster

* refacto

* fix(TBD-14086): fix empty spark conf

* feat(TBD-13647): contextualize DBR wizard

* fix isContext

Co-authored-by: unknown <ametivier@talend.com>

Co-authored-by: AlixMetivier-zz <50327620+AlixMetivier-zz@users.noreply.github.com>
2022-09-13 08:38:40 +02:00
zyuan-talend
021574267c fix(TUP-35745): Research: Bring a dark mode for Talend Studio. (#7966) 2022-09-13 10:49:19 +08:00
pyzhou
761e336111 feat(TDI-48332):oracle orai18n.jar (#7921)
* feat(TDI-48332):oracle orai18n.jar

* add dependency

* Add name

* fix wrong mvn path and name

* wrong import
2022-09-13 10:10:39 +08:00
jzhangbj
edb39550e6 Add localized files (#7969)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-09-09 17:26:00 +08:00
Dmytro Ochkas
245bd37ca8 chore(TDI-48339): aws CVE path traversal (#7957)
bump aws-java-sdk to 1.12.297
2022-09-09 11:55:39 +03:00
Oleksandr Zhelezniak
54c00306d9 fix(TDI-47865): guess schema flow (#7863) 2022-09-09 11:31:50 +03:00
tsasada-talend
2c7248ef83 Add localized files (#7967)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-09-09 15:13:57 +08:00
Alexiane Yvonet
01cd9c232b Add localized files (#7965)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-09-09 14:59:42 +08:00
Jane Ding
fea8d4065a update jdt pref (#7964) 2022-09-08 11:54:33 +08:00
sbliu
d143d33850 feat(TUP-36340) oracle add support of orai18n.jar (#7861) (#7962) 2022-09-08 11:08:19 +08:00
hcyi
8e3ec1f574 fix(TUP-35511):[JDBC TCK]: improve the ui layout for tck connector in (#7948)
studio
2022-09-07 15:35:43 +08:00
bhe-talendbj
17742a2c68 feat(TUP-36373): move m2 setting out of local setting (#7956) (#7958) 2022-09-07 09:59:01 +08:00
Liu Xinquan
8ea780dc4d fix(TDQ-20610) org.apache.lucene:lucene-core (#7944) 2022-09-06 17:19:16 +08:00
hzhao
b63ce620eb fix(TUP-36593): Nexus proxy password is stored in clear text in project (#7935) (#7953)
* fix(TUP-36593): Nexus proxy password is stored in clear text in project
setting preference

* fix(TUP-36593): Nexus proxy password is stored in clear text in project

* fix(TUP-36593): Nexus proxy password is stored in clear text in project
add junit
2022-09-06 09:34:19 +08:00
Jane Ding
19e68c1694 fix(TUP-36440):JSON parsing issue when creating a new JSON file input in (#7909) (#7952)
* fix(TUP-36440):JSON parsing issue when creating a new JSON file input in
a repository
https://jira.talendforge.org/browse/TUP-36440

* fix(TUP-36440):JSON parsing issue when creating a new JSON file input in
a repository
https://jira.talendforge.org/browse/TUP-36440

* fix(TUP-36440):JSON parsing issue when creating a new JSON file input in
a repository
https://jira.talendforge.org/browse/TUP-36440
2022-09-05 17:49:07 +08:00
kjwang
64b10e61a9 Kjwang/tup 32641 change the help system (#7856) (#7950)
* TUP-32641 Change the help system to open the links of component from CLM
https://jira.talendforge.org/browse/TUP-32641
2022-09-05 14:48:05 +08:00
wang wei
7d7e4398ac fix(TDI-48333): [CVE]: replace or remove xalan dependency for tfileinputxml and twebservicexxx components (#7890) (#7949) 2022-09-05 11:08:06 +08:00
pyzhou
f5b4f882ff fix(TDI-48456):tPOP java8 compatibility (#7929) 2022-09-02 17:39:04 +08:00
jzhangbj
20b460ddc3 Add localized files (#7936)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-09-02 14:56:04 +08:00
tsasada-talend
125870fea8 Add localized files (#7934)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-09-02 14:41:20 +08:00
sbliu
ac916cbc57 fix junit failure(#7933) (#7940) 2022-09-02 14:27:07 +08:00
bhe-talendbj
e180852f07 feat(TUP-36373): Delete .m2 with UI option when apply a monthly updat… (#7928)
* feat(TUP-36373): Delete .m2 with UI option when apply a monthly update (#7906)

* feat(TUP-36373): inital impl

* feat(TUP-36373): update messages

* feat(TUP-36373): fix UI

* feat(TUP-36373): update UI and message

* feat(TUP-36373): update UI of updatesite settings

* feat(TUP-36373): update UI of updatesite settings

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

* feat(TUP-36373): add doc link
2022-09-01 16:54:53 +08:00
Oleksandr Zhelezniak
c05c6f3c7f fix(TDI-48363): skip null enum parameter (#7870) 2022-09-01 11:11:49 +03:00
Oleksandr Zhelezniak
50db6d0d8a fix(TDI-48446): require library when no connection (#7924) 2022-09-01 10:36:47 +03:00
pyzhou
d09be2efef Added extra fields, dependencies + token fetch logic. (#7918) (#7923)
Co-authored-by: Balázs Gunics <bgunics@talend.com>

Co-authored-by: Balázs Gunics <bgunics@talend.com>
2022-09-01 11:20:50 +08:00
hcyi
2b69024fee fix(TUP-36483):Code generation fails with xmlmap. (#7892) 2022-08-30 17:56:55 +08:00
jzhao
2c97652a74 fix(TDI-48426):CVE: org.postgresql:postgresql:42.2.25 (#7902) 2022-08-30 15:57:33 +08:00
bhe-talendbj
f6d32e4ac1 fix(TUP-35879): Default value is not saved into the job in tck component (#7815) (#7914)
* fix(TUP-35879): persist closed_list of tck into job item

* fix(TUP-35879): add migration task and junit test

* fix(TUP-35879): fix test case
2022-08-29 17:46:44 +08:00
sbliu
b03481e60e chore(TUP-36502) upgrade org.postgresql:postgresql:42.2.25 to 42.2.26 (#7901) 2022-08-29 16:37:51 +08:00
Joe
4455d61521 fix(TUP-35231): tELTMap update query not be wrapped for SET column when (#7855) (#7916)
* fix(TUP-35231): tELTMap update query not be wrapped for SET column when
enable `Use update statement without subqueries` in tELTOutput

* fix(TUP-35231): tELTMap update query not be wrapped for SET column

* fix(TUP-35231): tELTMap update query not be wrapped for SET column
2022-08-29 10:21:01 +08:00
Dmytro Sylaiev
c9c84e121c fix(TDI-48316): Add remote dir name (#7864) 2022-08-19 20:39:32 +03:00
Alexiane Yvonet
4905cfd090 Add localized files (#7908)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-08-19 10:30:10 +08:00
Xilai Dai
30c0b563b1 fix(APPINT-34738) add MsmqTalend into osgi-exclude.properties (#7898) 2022-08-17 18:33:20 +08:00
wang wei
710bf29d2f fix(TDI-47696): [JDBC TCK]: Support dynamic changable setting when every row come, for tjdbcrow preparedstatementtable ui (#7711) (#7893) 2022-08-17 10:07:41 +08:00
zyuan-talend
e6c614bbc2 fix(TUP-35909):add junit test. (#7887) 2022-08-15 10:59:54 +08:00
Xuwei ZHU
4782532dca Add localized files (#7881)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-08-12 08:58:23 +08:00
jzhangbj
2f3bdc3e0b Add localized files (#7883)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-08-12 08:49:17 +08:00
Alexiane Yvonet
b2250689e9 Add localized files (#7877)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-08-11 17:40:01 +08:00
vyu-talend
ac2245fb06 Revert "fix(TDI-48213):fix the closing resources issues. (#7826) (#7873)" (#7879)
This reverts commit e29fa80408.
2022-08-11 15:35:10 +08:00
zyuan-talend
32dcb2e020 fix(TUP-35909):update junit test. (#7854) (#7871) 2022-08-10 19:17:38 +08:00
vyu-talend
e29fa80408 fix(TDI-48213):fix the closing resources issues. (#7826) (#7873)
* fix(TDI-48213):fix the closing resources issues.

* fix(TDI-48213):change the log level.
2022-08-10 18:30:52 +08:00
hzhao-talendbj
f1967f2645 (TUP-36341): Unable to run DQ reports with subjob+joblet on a cloud or (#7838) (#7872)
* (TUP-36341): Unable to run DQ reports with subjob+joblet on a cloud or
remote engine

* 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

* 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

* fix(TUP-36341): Unable to run DQ reports with subjob+joblet on a cloud
2022-08-10 16:58:09 +08:00
Oleksandr Zhelezniak
2c2f8e884e fix(TDI-46563): fix log message (#7869)
* add variable with empty value
2022-08-09 14:10:25 +03:00
jiezhang-tlnd
74d5f20345 Jzhang/tup 36410 (#7868)
* fix(TUP-36410)Need select talendssl.jar from local while building job
which using tLDAPInput

* format code

* add <stripVersion>true</stripVersion>
2022-08-09 18:00:18 +08:00
hcyi
db8732247a feat(TUP-35963):fix a bug when rename the link. (#7731) 2022-08-09 16:35:16 +08:00
Abdulhamid Rashankar
a91a2f6e71 APPINT-34738: Integrate Talend-customized Microsoft MQ driver jar with improved native library loading (#7858)
* APPINT-34738: Integrate Talend-customized Microsoft MQ driver jar with improved native library loading

* APPINT-34738: Integrate Talend-customized Microsoft MQ driver jar with improved native library loading

* APPINT-34738: Integrate Talend-customized Microsoft MQ driver jar with improved native library loading
2022-08-09 09:18:01 +02:00
pyzhou
e6f036a519 feat(TDI-47369): tSendMail Oauth2 (#7784) (#7866)
* fix(TDI-47369): tSendMail Oauth2

* fix migration

* feat(TDI-47447):tPOP OAuth2.0

* rename

* fix show if

* tSendMile MVN path

* tPOP mvn path

* correct migration description.
# Conflicts:
#	main/plugins/org.talend.repository/plugin.xml
2022-08-09 10:07:51 +08:00
pyzhou
6c5527d6e9 fix(TDI-48322):align javax.mail version (#7847) 2022-08-09 10:06:48 +08:00
wang wei
532c950982 fix(TDI-47717): [JDBC TCK]: support tjdbccommit/tjdbcrollback (#7867) 2022-08-09 09:42:54 +08:00
qiongli
f26d262975 fix(TDQ-20362): Update and save analysis when rename jdbc connection (#7817) 2022-08-08 09:48:59 +08:00
pyzhou
d3800d42ea fix(TDI-46737) (#7843) 2022-08-05 10:29:07 +08:00
Xuwei ZHU
4a2583f672 Add localized files (#7846)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-08-04 17:24:30 +08:00
jzhangbj
4fde7f3df4 Add localized files (#7845)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-08-04 17:20:09 +08:00
Alexiane Yvonet
5c962b4b9c Add localized files (#7844)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-08-04 17:02:20 +08:00
msjian
acd2da7b3c fix(TDQ-20638): fix a replacement error for DQ item (#7839) 2022-08-02 17:14:43 +08:00
sbliu
befb625719 feat(TUP-29393) amend message. (#7837) 2022-08-02 15:33:48 +08:00
pyzhou
43f7b1f96b feat(TDI-46737):print jobinfo log move (#7832) 2022-08-02 14:46:18 +08:00
vyu-talend
3cbfcff2a1 fix(TDI-48246):upgrade guava to align. (#7809) (#7834) 2022-08-02 12:03:25 +08:00
pyzhou
40214ad0f9 fix(TDI-48254): tRSSOoutput encoding issue (#7799)
* fix(TDI-48254): tRSSOoutput encoding issue

* Changed to compatible with jdk 8
2022-08-02 10:26:22 +08:00
vyu-talend
7aeecb33de fix(TDI-48082):add additional parameters to all greenplum. (#7794) (#7830) 2022-08-02 10:20:19 +08:00
tsasada-talend
120c8f067f Add localized files (#7823)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-29 15:29:58 +08:00
jzhangbj
4aef962f93 Add localized files (#7822)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-29 15:29:16 +08:00
Alexiane Yvonet
ccfd0210d9 Add localized files (#7821)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-29 15:28:23 +08:00
jzhangbj
efb3892845 Add localized files (#7810)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-29 15:27:22 +08:00
sbliu
0a076d5864 feat(TUP-29393) remove preference initialization of nexus connection timeout (#7789) (#7820)
* feat(TUP-29393) remove preference initialization of nexus connection timeout

* use same label for both local and remote connection, for default connection timeout / default read timeout

* change label for database connection timeout
2022-07-27 17:58:14 +08:00
jiezhang-tlnd
aa3d21f60d fix(TUP-35446)CVE: org.apache.maven:maven-core:3.8.3 (#7747) (#7819) 2022-07-27 15:09:11 +08:00
sbliu
6057fa9b53 fix(TUP-36128) fix problem when parse where condition string which contains global string for tELTmap. (#7801) (#7816)
* fix(TUP-36128) fix problem when parse where condition string which contains global string for tELTmap.

* fix(TUP-36128) add junit .
2022-07-27 10:48:10 +08:00
wang wei
af32c2d607 fix(TDI-48086): CVE poi-scratchpad (#7814) 2022-07-27 10:19:52 +08:00
wang wei
738392a032 fix(TDI-48203): [CVE]: routines.system.JSONObject(Object bean) use reflect to call method invoke, that's dangerous for evil script inject(#7721) (#7813) 2022-07-27 09:51:33 +08:00
Oleksandr Zhelezniak
23a494f865 chore(TDI-48177): bump google oauth (#7765)
* 1.31.0 -> 1.33.3
2022-07-26 11:03:43 +03:00
sbliu
fbf81a76fe fix(TUP-36252) fix NPE for tos studio build job (#7806) 2022-07-26 14:25:30 +08:00
jzhao
b5bbb4ab54 feat(TDI-46737):print jobinfo log (#7618) (#7811)
* feat(TDI-46737):print jobinfo log

* fix compaile error when log4jndisabled

* feat(TDI-46737): replace /n with /t

* put jobinfo outside main method

* add boundary check

Co-authored-by: pyzhou <pyzhou@talend.com>
2022-07-26 11:29:58 +08:00
sbliu
79091dad0d chore(TUP-35865) remove dependency link to wstx-asl in libraries.apache.axis (#7727) 2022-07-22 17:28:11 +08:00
Zhiwei Xue
86c76cea8f fix(TUP-18979):Migration tasks including mapping files (#7730) (#7808) 2022-07-22 16:51:42 +08:00
Oleksandr Zhelezniak
5833e5b3b3 chore(TDI-48081): bump xmlsec 2.3.1 (#7769)
* MCRMInput\Output 2.1.2 -> 2.3.1
2022-07-22 09:47:10 +03:00
kjwang
a30b7fb50e TUP-36157 Error when install Bigtable in studio: Illegal character in (#7764)
TUP-36157 Error when install Bigtable in studio: Illegal character in query
https://jira.talendforge.org/browse/TUP-36157
2022-07-22 09:37:05 +08:00
Jane Ding
663a066477 fix(TUP-36192):Talend 8 - Unable to Save Job (#7783) (#7805)
* fix(TUP-36192):Talend 8 - Unable to Save Job
https://jira.talendforge.org/browse/TUP-36192

* fix(TUP-36192):Talend 8 - Unable to Save Job
https://jira.talendforge.org/browse/TUP-36192
2022-07-21 17:50:30 +08:00
tsasada-talend
ff52f0c86f Add localized files (#7800)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-21 16:43:36 +08:00
sbliu
d045f176a1 chore(TUP-35948) showOverwrite enabled when is cloud connection (#7770) (#7796)
show override in preference page load from logon dialog when product is cloud license or tp_all license.
2022-07-21 10:58:35 +08:00
jzhao
71fda3d5be fix(TDI-48235):align bouncycastle to 1.70 (#7760) 2022-07-20 16:16:31 +08:00
jzhao
dedff2bbda fix(TDI-48046): CVE: IBM MQ 9.2.4.0 (#7758) 2022-07-20 15:41:56 +08:00
hzhao-talendbj
c990583855 Revert "chore(TUP-35265): upgrade 'crypto-utils' jar in low level (#7645) (#7724)" (#7792)
This reverts commit 7e5d9ed650.
2022-07-19 16:55:41 +08:00
jiezhang-tlnd
4f93848f0f Revert "Revert "feat(TUP-35808)Generate module name from maven url (#7751)" (#7759)" (#7793)
This reverts commit c8e9707bb9.
2022-07-19 16:04:46 +08:00
pyzhou
4a368ce478 fix(TDI-48024): ResumeUtil performance issue. (#7771) 2022-07-19 10:31:11 +08:00
vyu-talend
92f3ef63e8 fix(TDI-47976):fix some potencial npe. (#7757) (#7787) 2022-07-19 10:21:27 +08:00
wang wei
1d8a178b8a fix(TDI-48221): tDBBulkExec (MYSQL) Failing with error (#7785) 2022-07-18 10:10:59 +08:00
Dmytro Sylaiev
fdf0cf1596 feat(TDI-46563): Allow not to fire ANALYZE command (#7729) 2022-07-15 12:18:25 +03:00
tsasada-talend
315430e76b Add localized files (#7781)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-15 16:16:12 +08:00
Jane Ding
f96e6906b8 feat(TUP-35644):tMap - possible simplified metrics to send to Pendo (#7690) (#7777)
* 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

* 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

* feat(TUP-35644):tMap - possible simplified metrics to send to Pendo
https://jira.talendforge.org/browse/TUP-35644
2022-07-14 18:08:25 +08:00
vyu-talend
99bf99112d feat(TDI-44761):improve sftp in ftp components (#7728) (#7776)
* feat(TDI-44761):improve sftp in ftp components.

* feat(TDI-44761):update plugin.xml for migration task.

* Delete .project

* feat(TDI-47761):improve code

* feat(TDI-44761):fix something

* feat(TDI-44761):fix migration issue.

* feat(TDI-47761):fix migration task.

* feat(TDI-44761):test manual build patch

* feat(TDI-44761):test migration task.

* feat(TDI-44761):improve code

* feat(TDI-44761):fix string value issue.

* feat(TDI-44761):import java.util.map.

* feat(TDI-44761):fix UI issue.

* feat(TDI-44761):improve migration.

* feat(TDI-44761):improve migration.
2022-07-14 16:57:57 +08:00
hcyi
17b2bb6b34 feat(TUP-30684):fix a bug if the table is start with a number or (#7775)
illegal character.
2022-07-14 15:15:16 +08:00
zshen-talend
fe9ce8f275 fix(TDQ-20577): replace project name with lowercase mode in TDQItems when export job (#7767) 2022-07-14 14:29:58 +08:00
Jill Yan
a709eb1a3d APPINT-34809 fix JSON exception (#7753)
Co-authored-by: jillyan <yan955599@gmail.com>
2022-07-14 09:37:12 +08:00
Jane Ding
978f08b5b5 Jding/tup 35939 file dialog style (#7755) (#7766)
* fix(TUP-35939):tFileOutput components resulting in File not found error
when selecting a file path for saving the output file.
https://jira.talendforge.org/browse/TUP-35939

* fix(TUP-35939):tFileOutput components resulting in File not found error
when selecting a file path for saving the output file.
https://jira.talendforge.org/browse/TUP-35939

* fix(TUP-35939):tFileOutput components resulting in File not found error
when selecting a file path for saving the output file.
https://jira.talendforge.org/browse/TUP-35939
2022-07-13 19:07:59 +08:00
jiezhang-tlnd
c8e9707bb9 Revert "feat(TUP-35808)Generate module name from maven url (#7751)" (#7759)
This reverts commit 7365a191ea.
2022-07-12 16:58:14 +08:00
Dmytro Sylaiev
4b1cdc1193 fix(TDI-47908): Commit stats in case of Error (#7703) 2022-07-12 11:14:41 +03:00
pyzhou
2d8bc2352d fix(TDI-48290): tCould upgrade (#7750) 2022-07-12 09:20:38 +08:00
hcyi
0ebc632024 feat(TUP-30684):snowflake Feature request to refresh the table schema instead of automatically refreshing all table schemas. (#7699)
* feat(TUP-30684):snowflake Feature request to refresh the table schema
instead of automatically refreshing all table schemas.

* feat(TUP-30684):add junits
2022-07-11 18:41:33 +08:00
jiezhang-tlnd
7365a191ea feat(TUP-35808)Generate module name from maven url (#7751)
https://jira.talendforge.org/browse/TUP-35808
2022-07-11 17:46:56 +08:00
kjwang
c1182639f7 Fix: TUP-36107 In Studio 8 Stats & Logs project settings are removed (#7723) (#7749)
Fix: TUP-36107 In Studio 8 Stats & Logs project settings are removed after enabling "Publish to artifact repository" feature
https://jira.talendforge.org/browse/TUP-36107
2022-07-11 09:39:37 +08:00
zshen-talend
dc4e685dce fix(TDQ-20754): revert code to keep project is lowercase (#7746) 2022-07-08 17:46:37 +08:00
wang wei
068aed3cd8 fix(TDI-47694): [JDBC TCK]: Inject runtime context for tck connector runtime(#7743) 2022-07-08 15:44:23 +08:00
pyzhou
8cf06e4e2e fix(TDI-48107):gson CVE (#7649)
* fix(TDI-48107):gson CVE

* fix(TDI-48107):gson CVE 2.8.9

* fix(TDI-48107):gson CVE

* fix(TDI-48107):gson CVE

* upgrade version

* missing GoogleDataprocManage
2022-07-07 23:41:17 +08:00
Emmanuel GALLOIS
d54b04c285 fix(TCOMP-2171): fix ComponentIndex constructor in TaCoKitUtilTest (#7737) 2022-07-07 14:36:50 +02:00
tsasada-talend
c2af6c8d9f Add localized files (#7734)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-07 17:15:16 +08:00
Alexiane Yvonet
e85a60ebce Add localized files (#7733)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-07 17:11:55 +08:00
Emmanuel GALLOIS
87926e93b0 fix(TCOMP-2171): fix ComponentIndex constructor (#7715) 2022-07-07 10:28:40 +02:00
hzhao-talendbj
7e5d9ed650 chore(TUP-35265): upgrade 'crypto-utils' jar in low level (#7645) (#7724) 2022-07-06 09:53:52 +08:00
sponomarova
2fa2e5ad01 fix(TBD-13990): [Patch R2022-05v2_8.0.1] tHiveConnection component doesn't generate code for url_tHiveConnection variable definition (#7669) (#7720) 2022-07-04 14:59:30 +03:00
Dmytro Grygorenko
532b7e635d fix(TDI-48185): bump "nimbus-jose" version (leftovers). (#7712) 2022-07-04 11:23:11 +03:00
zyuan-talend
d2d9447caa fix(TUP-31721):Not clear studio index cache in normal case. (#7616) (#7705) 2022-07-01 19:37:09 +08:00
jzhao
3b61af4e85 fix(TDI-48159):tSalesforceEinsteinBulkExec align force-wsc with other sf (#7693)
components
2022-07-01 14:41:43 +08:00
jzhangbj
7de187df81 Add localized files (#7707)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-01 10:36:48 +08:00
tsasada-talend
65f171ac10 Add localized files (#7706)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-01 10:36:12 +08:00
Jane Ding
d7e2e05c66 fix(TUP-35939):tFileOutput components resulting in File not found error (#7666) (#7708)
* fix(TUP-35939):tFileOutput components resulting in File not found error
when selecting a file path for saving the output file.
https://jira.talendforge.org/browse/TUP-35939

* fix(TUP-35939):tFileOutput components resulting in File not found error
when selecting a file path for saving the output file.
https://jira.talendforge.org/browse/TUP-35939
2022-07-01 10:29:04 +08:00
Abdulhamid Rashankar
8c161c821f APPINT-34489 : profile added for prometheus dependencies (#7701) 2022-06-30 09:15:04 +02:00
wang wei
fc4c4b1900 fix(TDI-47714): [JDBC TCK]: "Use existed connection" ui appear in (#7586) (#7704) 2022-06-30 11:52:30 +08:00
pyzhou
0ccd9ff9fa fix(TDI-48113):CVE woodstox-core (#7650) 2022-06-30 10:16:08 +08:00
Dmytro Sylaiev
5df8cd540a fix(TDI-48004): Handle dependency with classifier (#7672) 2022-06-29 15:11:55 +03:00
zshen-talend
e6936b650c fix(TDQ-19623): fix junit about BuildJobHandlerTest.testBuildJobWithTDM (#7692) (#7698) 2022-06-29 13:03:54 +08:00
kjwang
3998e40cef Fix:TUP-35887 "build job" working in 7.2.1 fails in 8.0.1: Failed to generate code : NPE org.talend.designer.dbmap.language.oracle.OracleGenerationManager.addQuoteForSpecialChar (#7667) (#7696)
* Fix:TUP-35887
"build job" working in 7.2.1 fails in 8.0.1: Failed to generate code :
NPE org.talend.designer.dbmap.language.oracle.OracleGenerationManager.addQuoteForSpecialChar
https://jira.talendforge.org/browse/TUP-35887
2022-06-29 11:52:53 +08:00
bhe-talendbj
f5d80e4f01 fix(TUP-35942): update relevant job only after renaming joblet (#7673) (#7695) 2022-06-29 11:39:20 +08:00
Jill Yan
2d1fa2a083 APPINT-34694 build routelet module (#7675)
Co-authored-by: jillyan <yan955599@gmail.com>
2022-06-29 10:48:31 +08:00
Wei Hua
8125ca9a29 APPINT-31958 Wrong endpoint displayed in console message when using cRest/tRESTRequest (#7679) 2022-06-28 16:23:50 +08:00
Olha V
296df1bfde fix(TDI-48035): Add null marker to tBigQueryOutput (#7662) 2022-06-24 09:53:20 +03:00
Jane Ding
6a89474d30 fix(TUP-35599):SuggestionValues.Item support of user friendly UI label (#7686)
different from it's id
https://jira.talendforge.org/browse/TUP-35599
2022-06-24 14:27:00 +08:00
Chao MENG
acfaeb05a2 chore: update plugin timestamp (#7684) 2022-06-23 17:14:38 +08:00
Jane Ding
2f90ccd1a8 Jding/tup 35599 suggestion values UI to record id and label master (#7670)
* fix(TUP-35599):SuggestionValues.Item support of user friendly UI label
(#7619)

* 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

Conflicts:
	main/plugins/org.talend.repository/plugin.xml

* 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:29 +08:00
sbieliaievl
c0b30cf1e7 fix(APPINT-33830) - migration for demos (#7602)
* Added rename timeout parameters for tRESTClient migration

* fixed pom file structure

* Changed version in pom for migration

* fix(APPINT-33830) - rebase fix

* Update plugin.xml

* Update plugin.xml

* Update plugin.xml

* fix(APPINT-33830) - removed wrong break

* fix(APPINT-33830) - changed break
2022-06-21 10:35:23 +03:00
msjian
b5f96496f4 fix(TDQ-19435): fix a NPE (#7663) 2022-06-20 10:01:55 +08:00
zshen-talend
d0fbe0defa fix(TDQ-19623): make sure project name never force lowercase (#7661) 2022-06-17 10:17:23 +08:00
sponomarova
d9454a11ef feat(TBD-13823): spark local 3.2.x GA (#7652) (#7656) 2022-06-16 12:52:54 +03:00
zshen-talend
bca8dd8802 fix(TDQ-19623): make sure build job action work for reference project (#7654) 2022-06-15 18:18:37 +08:00
Dmytro Sylaiev
45c4e32c2a feat(TDI-47398): migrate adal4j to msal4j mscrm (#7556)
* feat(TDI-47398): Change adal4j to msal4j for talend-mscrm

* feat(TDI-47398): Change dependencies for tMicrosoftCRMXXX

* feat(TDI-47398): Implement oauth token acquiring

* chore(TDI-47398): Small microbes fix
2022-06-14 22:21:51 +03:00
hcyi
e637d53155 fix(TUP-35508):Better to improve context prompt for JDBC. (#7624)
* fix(TUP-35508):Better to improve context prompt for JDBC.

* fix(TUP-35508):Better to improve context prompt for JDBC.

* fix(TUP-35508):Better to improve context prompt for JDBC.

* 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:33 +08:00
wang wei
537bd1b73a fix(TCOMP-2122): [JDBC TCK]: can't get user defined schema info in tck runtime in studio when no data outut line 2022-06-14 13:56:21 +08:00
Laurent BOURGEOIS
2fcf4be1e2 fix(TBD-13581):tHiveConnection doesn't support spark 3.1.x dataproc 2.0.x (#7646) 2022-06-10 14:33:51 +02:00
Jane Ding
86ee3f4ad1 feat(TUP-33085):Add Icon(s) to open Help (#7571) (#7643)
* 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
2022-06-10 17:25:55 +08:00
Xuwei ZHU
106c010d53 Add localized files (#7642)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-06-09 19:08:34 +08:00
Alexiane Yvonet
80917277a5 Add localized files (#7640)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-06-09 19:08:21 +08:00
Dmytro Sylaiev
f0fe150ec0 fix(TDI-47951): Don't set null passw for sso auth (#7580)
* fix(TDI-47951): Don't set null passw for sso auth

* fix(TDI-47951): Handle possible NPE

* For tRedshiftUnload and tRedshiftBE/OBE
2022-06-09 13:44:22 +03:00
Dmytro Grygorenko
46523080d3 fix(TDI-47935): bump "nimbus-jose-jwt" lib to fix CVE. (#7522) 2022-06-09 10:32:59 +03:00
jiezhang-tlnd
68b5e9e7c4 export dataset need with datastore (#7579) (#7639)
* export dataset need with datastore

* issue is that deleting datastore but dataset not be deleted

* fix selection issue on export wizard

* fomat code

* format code

* improve performance

* improve performance by adding objectType

* improve code and handle import issue

* code format
2022-06-09 10:58:42 +08:00
Chao MENG
c3b1df17a0 item(TUP-35556): Handle demo feedbacks for update from TMC (#7595)
https://jira.talendforge.org/browse/TUP-35556
2022-06-09 10:50:06 +08:00
msjian
d7af0fc449 Revert "fix(TDQ-20476): fix match analysis run get error (#7622)" (#7633)
This reverts commit fd2c8b365b.
2022-06-08 16:21:22 +08:00
jiezhang-tlnd
c2408e4223 fix(TUP-35683)doc use job for route, joblet for routelet (#7630) (#7636)
https://jira.talendforge.org/browse/TUP-35683
2022-06-08 15:35:19 +08:00
sbieliaievl
2ec3561107 fix(APPINT-24774) - POST/PUT operations when importing API in tRESTRequest should declare a body parameter (#7518)
* fix(APPINT-24774) - POST/PUT operations when importing API in
tRESTRequest should declare a body parameter

* fix(APPINT-24774) - POST/PUT operations when importing API in
tRESTRequest should declare a body parameter
2022-06-08 08:46:55 +03:00
jiezhang-tlnd
acc3c15744 feat(TUP-34931)Support Sybase 17 (#7620) (#7632) 2022-06-08 10:59:30 +08:00
msjian
fd2c8b365b fix(TDQ-20476): fix match analysis run get error (#7622) 2022-06-07 18:59:12 +08:00
wang wei
cb369968e9 fix(TDI-48037): CVE: org.postgresql:postgresql:42.2.14 (#7573) (#7629) 2022-06-07 17:57:32 +08:00
jzhangbj
70f018b26f Add localized files (#7611)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-06-06 09:32:59 +08:00
tsasada-talend
f6a4d9022f Add localized files (#7610)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-06-06 09:31:59 +08:00
Alexiane Yvonet
616815d794 Add localized files (#7609)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-06-06 09:30:39 +08:00
pyzhou
8767e96bcd fix(TDI-48069):tRedshiftBulkExec wrong version (#7608) 2022-06-02 19:39:27 +08:00
Jill Yan
26dcedadef fix compile error (#7605)
Co-authored-by: jillyan <yan955599@gmail.com>
2022-06-02 11:00:48 +08:00
hcyi
58a39c8fb8 feat(TUP-34854):Setup custom JKS for signature by System Property (#7382)
* feat(TUP-34854):Setup custom JKS for signature by System Property

* feat(TUP-34854):improve for Setup custom JKS for signature by System
Property

* feat(TUP-34855):Setup custom JKS for job signature from GUI.

* feat(TUP-34855):Setup custom JKS for job signature from GUI.

* feat(TUP-34855):Setup custom JKS for job signature from GUI.
2022-06-02 10:58:37 +08:00
Chao MENG
7cf738b911 Cmeng/fix/tup 35585 zero install tck (#7568)
* fix(TUP-35585): Zero install fail to install custom tck component in
801.
https://jira.talendforge.org/browse/TUP-35585
2022-06-02 09:55:26 +08:00
Jill Yan
42b7a46dee APPINT-34618 add mssql driver to import-package if used in child job (#7587)
Co-authored-by: jillyan <yan955599@gmail.com>
2022-06-02 09:10:13 +08:00
Jane Ding
70314bd2b4 feat(TUP-35301):[JDBC TCK]: Support MODULE_LIST field for studio tck (#7517) (#7599)
* feat(TUP-35301):[JDBC TCK]: Support MODULE_LIST field for studio tck
plugin
https://jira.talendforge.org/browse/TUP-35301

* feat(TUP-35301):[JDBC TCK]: Support MODULE_LIST field for studio tck
plugin
https://jira.talendforge.org/browse/TUP-35301

* feat(TUP-35301):[JDBC TCK]: Support MODULE_LIST field for studio tck
plugin
https://jira.talendforge.org/browse/TUP-35301

* feat(TUP-35301):[JDBC TCK]: Support MODULE_LIST field for studio tck
plugin
https://jira.talendforge.org/browse/TUP-35301
fix(TUP-35716):[bug] new JDBC driver column will be always set to mvn
after reopen wizard
https://jira.talendforge.org/browse/TUP-35716
driver table contains path=mvn:xxxx/xxxx

* feat(TUP-35301):[JDBC TCK]: Support MODULE_LIST field for studio tck
plugin
https://jira.talendforge.org/browse/TUP-35301
2022-06-01 16:22:23 +08:00
zshen-talend
d42dc6e42e test to avoid project name lowercase (#7598) 2022-06-01 16:14:15 +08:00
wang wei
b824673188 fix(TDI-47803): Compile error after applying Patch_20220107_R2022-01_v1-7.3.1 (#7474) (#7597) 2022-06-01 11:42:11 +08:00
jiezhang-tlnd
c34725bbef feat(TUP-28853)tRunjob is ok, need handle joblet (#7484) (#7594)
* feat(TUP-28853)tRunjob is ok, need handle joblet

* generation document is ok from standard process

* format code

* reduce the same item to improve performance

* Remove duplicates to improve performance and fix preview picture missing
issue

* handle latest version on tRunjob

* handle version for joblet

* hanlde version

* improve performance with VersionList

* handle BD process part

* handle BD process

* handle route process

* code formate

* format code
2022-05-31 17:41:50 +08:00
Dmytro Sylaiev
f517e56b83 feat(TDI-44884): Correct missing label change (#7593) 2022-05-31 11:52:32 +03:00
Oleksandr Zhelezniak
9ed98d4f9d fix(TDI-47895): oracle input float length (#7545)
* force to use 38 as length for NUMBER (FLOAT) in oracle when getPrecision returns value bigger than 38
* getPrecision for Float Oracle returns 126.
* It's expected binary precision for FLOAT Oracle type. The decimal precision for it is 38.
2022-05-31 11:03:01 +03:00
bhe-talendbj
7a9ff69e14 chore(TUP-35685): upgrade database driver version (#7576) (#7592) 2022-05-31 14:35:00 +08:00
Chao MENG
8acb79fbd4 fix(TUP-35633): 'Use local Update settings' checkbox should not be (#7577)
fix(TUP-35633): 'Use local Update settings' checkbox should not be displayed in studio update settings when TMC update config is not set
for the project.
https://jira.talendforge.org/browse/TUP-35633
2022-05-31 10:20:33 +08:00
Oleksandr Zhelezniak
04b7d3251e fix(TDI-45946): greenplum mapping (#7514)
* add mapping type in XML for input and output
* migration task, replace mapping type from postgres_id to greenplum_id
2022-05-30 16:09:33 +03:00
Alexiane Yvonet
e64b5d2e23 Add localized files (#7588)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-05-30 15:41:58 +08:00
jzhangbj
ed74850972 Add localized files (#7583)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-05-30 10:12:14 +08:00
tsasada-talend
caed4cf474 Add localized files (#7582)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-05-30 09:41:38 +08:00
sponomarova
971e661a0e feat(TBD-13581): Dataproc 2.x support for di jobs (#7488) (#7537) 2022-05-27 13:29:11 +03:00
Zhiwei Xue
8a87f281f9 fix(TUP-35613):Can't display the dataset settings of AzureAdlsGen2 (#7581)
metadata wizard with CSV format in default GUI size
2022-05-27 10:35:32 +08:00
Chao MENG
c54b8ed321 fix(TUP-35608): Stat and Logs screen - Database connection dropdown incorrect (#7559)
* fix(TUP-35608): Stat and Logs screen - Database connection dropdown
incorrect
https://jira.talendforge.org/browse/TUP-35608
2022-05-27 09:52:15 +08:00
hcyi
62301ff268 fix(TUP-35326):[JDBC TCK]: can't pass table value to runtime when use existed connection (#7506)
* fix(TUP-35326):[JDBC TCK]: can't pass table value to runtime when use
existed connection

* fix(TUP-35326):[JDBC TCK]: can't pass table value to runtime when use
existed connection
2022-05-26 15:29:09 +08:00
Zhiwei Xue
1f2d1e0820 fix(TUP-31233):Routine pom is not updated after installed the required (#7548)
* 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

* fix(TUP-31233):Routine pom is not updated after installed the required
jar of user routine
2022-05-25 18:05:03 +08:00
hzhao-talendbj
9eb840b026 Revert "chore(TUP-34757): Add a getOriginalName() in IConnection (#7301)" (#7563)
This reverts commit 5c9a80937a.
2022-05-25 17:28:19 +08:00
Dmytro Sylaiev
bc5d868c62 feat(TDI-44884): Change the label of Sybase SA (#7558) 2022-05-24 15:53:43 +03:00
598 changed files with 7818 additions and 1589 deletions

View File

@@ -43,6 +43,7 @@
<plugin id="org.talend.migrationTool.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.model.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.repository.generic.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.repository.json.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.repository.items.importexport.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.repository.items.importexport.ui.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.repository.localprovider.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>

View File

@@ -56,8 +56,9 @@
String jobClassPackageFolder = codeGenArgument.getCurrentProjectName().toLowerCase() + '/' + jobFolderName;
boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));//log4j enable
boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J2_ACTIVATE__"));//log4j2 enable
boolean isLog4j1Enabled = !isLog4j2Enabled;//log4j1 enable
boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J2_ACTIVATE__"));//log4j2 enable
boolean isLog4j1Enabled = !isLog4j2Enabled;//log4j1 enable
String MDC_CLASS = "org.slf4j.MDC";
boolean exist_tParallelize = false;
List<? extends INode> tParallelizeList = process.getNodesOfType("tParallelize");
@@ -321,6 +322,8 @@
globalMap.put(GLOBAL_CONNECTION_POOL_KEY, connectionPool);
}
<%}%>
private final static java.util.Properties jobInfo = new java.util.Properties();
public static void main(String[] args){
final <%=className %> <%=className %>Class = new <%=className %>();
@@ -334,6 +337,42 @@
System.exit(exitCode);
}
private void getjobInfo() {
final String TEMPLATE_PATH = "src/main/templates/jobInfo_template.properties";
final String BUILD_PATH = "../jobInfo.properties";
final String path = this.getClass().getResource("").getPath();
if(path.lastIndexOf("target") > 0) {
final java.io.File templateFile = new java.io.File(
path.substring(0, path.lastIndexOf("target")).concat(TEMPLATE_PATH));
if (templateFile.exists()) {
readJobInfo(templateFile);
return;
}
}
readJobInfo(new java.io.File(BUILD_PATH));
}
private void readJobInfo(java.io.File jobInfoFile){
if(jobInfoFile.exists()) {
try {
jobInfo.load(new java.io.FileInputStream(jobInfoFile));
} catch (IOException e) {
<%if(isLog4jEnabled){%>
log.debug("Read jobInfo.properties file fail: " + e.getMessage());
<%}%>
}
}
<%if(isLog4jEnabled){%>
log.info(String.format("Project name: %s\tJob name: %s\tGIT Commit ID: %s\tTalend Version: %s",
projectName,jobName,jobInfo.getProperty("gitCommitId"), "<%=System.getProperties().getProperty("talend.studio.version")%>"));
<%}%>
}
<%
if (isTestContainer) {
@@ -515,8 +554,34 @@
org.apache.logging.log4j.core.config.Configurator.setLevel(org.apache.logging.log4j.LogManager.getRootLogger().getName(), log.getLevel());
<%}%>
}
getjobInfo();
log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Start.");
<%}%>
<%if(isLog4j2Enabled) {%>
java.util.Set<Object> jobInfoKeys = jobInfo.keySet();
for(Object jobInfoKey: jobInfoKeys) {
<%=MDC_CLASS%>.put("_" + jobInfoKey.toString(), jobInfo.get(jobInfoKey).toString());
}
<%=MDC_CLASS%>.put("_pid", pid);
<%=MDC_CLASS%>.put("_rootPid", rootPid);
<%=MDC_CLASS%>.put("_fatherPid", fatherPid);
<%=MDC_CLASS%>.put("_projectName", projectName);
<%=MDC_CLASS%>.put("_startTimestamp",java.time.ZonedDateTime.now(java.time.ZoneOffset.UTC ).format( java.time.format.DateTimeFormatter.ISO_INSTANT ));
<%=MDC_CLASS%>.put("_jobRepositoryId","<%=process.getId() %>");
<%=MDC_CLASS%>.put("_compiledAtTimestamp","<%=java.time.ZonedDateTime.now(java.time.ZoneOffset.UTC ).format( java.time.format.DateTimeFormatter.ISO_INSTANT )%>");
java.lang.management.RuntimeMXBean mx = java.lang.management.ManagementFactory.getRuntimeMXBean();
String[] mxNameTable = mx.getName().split("@"); //$NON-NLS-1$
if (mxNameTable.length == 2) {
<%=MDC_CLASS%>.put("_systemPid", mxNameTable[0]);
} else {
<%=MDC_CLASS%>.put("_systemPid", String.valueOf(java.lang.Thread.currentThread().getId()));
}
<%
}%>
<%
INode jobCatcherNode = null;
@@ -642,14 +707,26 @@
pid = TalendString.getAsciiRandomString(6);
}
<%if(isLog4j2Enabled) {%>
<%=MDC_CLASS%>.put("_pid", pid);
<%}%>
if (rootPid==null) {
rootPid = pid;
}
<%if(isLog4j2Enabled) {%>
<%=MDC_CLASS%>.put("_rootPid", rootPid);
<%}%>
if (fatherPid==null) {
fatherPid = pid;
}else{
isChildJob = true;
}
<%if(isLog4j2Enabled) {%>
<%=MDC_CLASS%>.put("_fatherPid", fatherPid);
<%}%>
<%
if (stats) {
@@ -883,7 +960,12 @@
}
%>
//Resume: jobStart
resumeUtil.addLog("JOB_STARTED", "JOB:" + jobName, parent_part_launcher, Thread.currentThread().getId() + "", "","","","",resumeUtil.convertToJsonText(context,parametersToEncrypt));
resumeUtil.addLog("JOB_STARTED", "JOB:" + jobName, parent_part_launcher, Thread.currentThread().getId() + "", "","","","",resumeUtil.convertToJsonText(context,ContextProperties.class,parametersToEncrypt));
<%if(isLog4j2Enabled) {%>
<%=MDC_CLASS%>.put("_context", contextStr);
log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Started.");
<%}%>
<%
if (stats) {
@@ -1156,9 +1238,15 @@ this.globalResumeTicket = false;//to run others jobs
if (!componentName.equals("tJobStructureCatcher") && !componentName.equals("tLogCatcher") && !componentName.equals("tFlowMeterCatcher") && !componentName.equals("tAssertCatcher") && !componentName.equals("tStatCatcher") && !componentName.equals("tAsyncIn")) {
%>
<%=createCallProcess(rootNode, className, false) %>
<% }
}
}// end if(isRunInMultiThread)
<%
if (process.getNodesOfType("tStatCatcher").size() > 0) {
%>
<%=statsErrorHandlingAfterMainCall(rootNode, process.getNodesOfType("tStatCatcher"))%>
<%
}
}
}
}// end if(isRunInMultiThread)
%>
this.globalResumeTicket = true;//to run tPostJob
@@ -1292,6 +1380,15 @@ if (execStat) {
returnCode = errorCode.intValue();
}
resumeUtil.addLog("JOB_ENDED", "JOB:" + jobName, parent_part_launcher, Thread.currentThread().getId() + "", "","" + returnCode,"","","");
resumeUtil.flush();
<%if(isLog4j2Enabled) {%>
<%=MDC_CLASS%>.remove("_subJobName");
<%=MDC_CLASS%>.remove("_subJobPid");
<%=MDC_CLASS%>.remove("_systemPid");
log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Finished - status: " + status + " returnCode: " + returnCode );
<%}%>
return returnCode;

View File

@@ -42,10 +42,10 @@ public class CLASS
//List< ? extends IConnection> onSubJobErrorConns = rootNode.getOutgoingConnections(EConnectionType.ON_SUBJOB_ERROR);
//if(onSubJobErrorConns!=null){
// for(IConnection conn : onSubJobErrorConns) {
// for(IConnection conn : onSubJobErrorConns) {
// toReturn += createCallProcess(conn.getTarget(), className, isMultiThread);
// }
//}
//}
if(isMultiThread){
toReturn += "\n}catch (java.lang.Error e_" + rootNode.getUniqueName() + ") {\n";
toReturn += "globalMap.put(\""+rootNode.getUniqueName()+ "_SUBPROCESS_STATE\", -1);\n";
@@ -55,7 +55,20 @@ public class CLASS
toReturn += "\n}";
return toReturn;
}
public String statsErrorHandlingAfterMainCall(INode rootNode, List<? extends INode> statsNodes) {
String catchErrorReturn = "catch (Error error_" + rootNode.getUniqueName() + " ) {\n";
catchErrorReturn+="end = System.currentTimeMillis();\n";
for (INode statCatcherNode : statsNodes) {
catchErrorReturn += statCatcherNode.getUniqueName() + ".addMessage(\"failure\", (end-startTime));\n";
catchErrorReturn += "try {\n " + statCatcherNode.getDesignSubjobStartNode().getUniqueName() + "Process(globalMap);\n";
catchErrorReturn += "} catch (Exception e_" + statCatcherNode.getUniqueName() + ") {\n";
catchErrorReturn += "e_" + statCatcherNode.getUniqueName() + ".printStackTrace();\n}\n";
}
catchErrorReturn+= "throw error_" + rootNode.getUniqueName() + ";\n}\n";
return catchErrorReturn;
}
public String generate(Object argument) {
return "";
}

View File

@@ -32,6 +32,8 @@
boolean stat = codeGenArgument.isStatistics();
boolean containsTPartitioner = subTree.getRootNode().getProcess().getNodesOfType("tPartitioner").size() > 0 ? true : false;
boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(subTree.getRootNode().getProcess(), "__LOG4J_ACTIVATE__"));
boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(subTree.getRootNode().getProcess(), "__LOG4J2_ACTIVATE__"));//log4j2 enable
String MDC_CLASS = "org.slf4j.MDC";
%>
<%
@@ -1603,6 +1605,11 @@ public void <%=subTree.getName() %>Process(final java.util.Map<String, Object> g
globalMap.put("<%=subTree.getName() %>_SUBPROCESS_STATE", 0);
final boolean execStat = this.execStat;
<%if(isLog4j2Enabled) {%>
<%=MDC_CLASS%>.put("_subJobName", "<%=subTree.getName() %>");
<%=MDC_CLASS%>.put("_subJobPid", TalendString.getAsciiRandomString(6));
<%}%>
<%
boolean isParallelize = false;
for (INode node : subTree.getNodes()) {

View File

@@ -152,7 +152,9 @@ public class CodeGeneratorService implements ICodeGeneratorService {
ComponentsFactoryProvider.getInstance().resetCache();
ILibraryManagerService librairesManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault().getService(
ILibraryManagerService.class);
librairesManagerService.clearCache();
//TUP-31721: The generated studio index will include every possible values with TP_ALL license .
//Studio 8 will not re-generate the index after applying patch and installing any component.
librairesManagerService.clearCache(false);
CorePlugin.getDefault().getLibrariesService().syncLibraries();
Job job = CodeGeneratorEmittersPoolFactory.initialize();
// achen modify to record ctrl+shift+f3 is pressed to fix bug 0006107

View File

@@ -1,5 +1,5 @@
ExchangeView.Exchange=Exchange
AvailableExtensionsComposite.ExtensionName=Extension\u540D
AvailableExtensionsComposite.ExtensionName=\u62E1\u5F35\u5B50\u540D
AvailableExtensionsComposite.Version=\u30D0\u30FC\u30B8\u30E7\u30F3
AvailableExtensionsComposite.Rating=\u8A55\u4FA1
AvailableExtensionsComposite.Author=\u4F5C\u6210\u8005
@@ -8,14 +8,14 @@ AvailableExtensionsComposite.ViewDetail.installOperateStatus=\u30A4\u30F3\u30B9\
AvailableExtensionsComposite.ViewDetail.WriteReview=\u518D\u8ABF\u67FB\u306E\u66F8\u304D\u8FBC\u307F
AvailableExtensionsComposite.ViewDetail.InsertionReviewFailure=Review\u633F\u5165\u5931\u6557\u3002
AvailableExtensionsComposite.ViewDetail.InsertionReviewFailureTip=\u30C1\u30A7\u30C3\u30AF\u3092\u3057\u3066\u304F\u3060\u3055\u3044\u3002
DownloadedExtensionsComposite.ExtensionName=Extension\u540D
DownloadedExtensionsComposite.ExtensionName=\u62E1\u5F35\u5B50\u540D
DownloadedExtensionsComposite.DownloadedVersion=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u30D0\u30FC\u30B8\u30E7\u30F3
DownloadedExtensionsComposite.DownloadDate=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u65E5\u4ED8
DownloadedExtensionsComposite.OperateStatus=\u30B9\u30C6\u30FC\u30BF\u30B9\u64CD\u4F5C
DownloadedExtensionsComposite.installOperateStatus=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB
DownloadedExtensionsComposite.installedOperateStatus=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u307F
DownloadedExtensionsComposite.updateOperateStatus=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
MyExtensionsComposite.ExtensionName=Extension\u540D
MyExtensionsComposite.ExtensionName=\u62E1\u5F35\u5B50\u540D
MyExtensionsComposite.Version=\u30D0\u30FC\u30B8\u30E7\u30F3
MyExtensionsComposite.UploadDate=\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u65E5\u4ED8
MyExtensionsComposite.AddNewExtensionTitle=\u65B0\u898FExtension\u8FFD\u52A0
@@ -91,7 +91,7 @@ ImportExchangeDialog.dialogTitle=Talend Exchange \u304B\u3089\u9805\u76EE\u306E\
ImportExchangeDialog.WARNING=\u8B66\u544A
ImportExchangeDialog.NOTSELECTWARNING=\u30C6\u30FC\u30D6\u30EB\u304B\u3089\u30A2\u30A4\u30C6\u30E0\u3092\uFF11\u3064\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044...
ImportExchangeDialog.downloadProgressBar=\u30A2\u30A4\u30C6\u30E0\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D\u3067\u3059\u3002\u66AB\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044!
ImportExchangeDialog.EXTENSION_NAME=Extension\u540D
ImportExchangeDialog.EXTENSION_NAME=\u62E1\u5F35\u5B50\u540D
ImportExchangeDialog.AUTHOR_NAME=\u4F5C\u6210\u8005\u540D
ImportExchangeDialog.LATEST_REVISION=\u6700\u65B0\u30EA\u30D3\u30B8\u30E7\u30F3
ImportExchangeDialog.EXTENSION_DESCRIPTION=\u62E1\u5F35\u306E\u8AAC\u660E

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.microsoft.azure</groupId>
<artifactId>adal4j</artifactId>
<version>1.6.4-20211021</version>
<version>1.6.6-20220707</version>
<packaging>jar</packaging>
<name>adal4j</name>
<description>
@@ -99,12 +99,12 @@
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>8.11</version>
<version>9.22</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
<version>2.8.9</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend</groupId>
<artifactId>talendMQRFH2</artifactId>
<version>1.1.0-20220307</version>
<version>1.2.0-20220707</version>
<packaging>jar</packaging>
<licenses>
@@ -47,7 +47,7 @@
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>com.ibm.mq.allclient</artifactId>
<version>9.2.4.0</version>
<version>9.2.5.0</version>
</dependency>
<dependency>
<groupId>org.talend.libraries</groupId>

View File

@@ -6,7 +6,7 @@
<!-- #################################################### -->
<!-- modification 1: config -->
<property name="jar.name" value="MsmqTalend-1.0.0.jar" />
<property name="jar.name" value="MsmqTalend-1.0.5.jar" />
<property name="component.name" value="tMicrosoftMQInput" />
<property name="author.name" value="ytao" />
@@ -81,4 +81,4 @@
<delete dir="${build.dir}" />
<mkdir dir="${build.dir}" />
</target>
</project>
</project>

View File

@@ -54,11 +54,6 @@
<artifactId>poi</artifactId>
<version>4.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
<version>4.1.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
<dependency>
<groupId>org.apache.poi</groupId>

View File

@@ -4,7 +4,7 @@
<groupId>org.talend.components.lib</groupId>
<artifactId>talend-aws</artifactId>
<version>1.0</version>
<version>1.1</version>
<packaging>jar</packaging>
<name>talend-aws</name>
@@ -50,7 +50,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
<version>1.11.848</version>
<version>1.12.297</version>
</dependency>
</dependencies>
<build>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.components</groupId>
<artifactId>talend-mscrm</artifactId>
<version>3.11-20220401</version>
<version>3.14-20220707</version>
<packaging>jar</packaging>
<name>talend-mscrm</name>
@@ -26,7 +26,7 @@
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.13</httpcore.version>
<junit.version>4.13.2</junit.version>
<adal4j.version>1.6.4-20211021</adal4j.version>
<adal4j.version>1.6.6-20220707</adal4j.version>
<jackson.version>2.13.2</jackson.version>
<jackson-databind.version>2.13.2.2</jackson-databind.version>
@@ -34,7 +34,7 @@
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
</properties>
<repositories>
<repository>
<id>talend_nexus_deployment</id>
@@ -69,7 +69,7 @@
</releases>
</repository>
</distributionManagement>
<dependencies>
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -102,7 +102,7 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-client-core</artifactId>
@@ -144,11 +144,6 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>adal4j</artifactId>
<version>${adal4j.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
@@ -164,6 +159,17 @@
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>msal4j</artifactId>
<version>1.11.2</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.9</version>
</dependency>
</dependencies>
<build>
<resources>

View File

@@ -0,0 +1,164 @@
package com.microsoft.aad.msal4j;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import org.slf4j.LoggerFactory;
import com.nimbusds.oauth2.sdk.ParseException;
import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
import com.nimbusds.oauth2.sdk.auth.ClientAuthenticationMethod;
import com.nimbusds.oauth2.sdk.auth.ClientSecretPost;
import com.nimbusds.oauth2.sdk.auth.PrivateKeyJWT;
import com.nimbusds.oauth2.sdk.auth.Secret;
import com.nimbusds.oauth2.sdk.id.ClientID;
import static com.microsoft.aad.msal4j.ParameterValidationUtils.validateNotNull;
public class OauthClientApplication extends AbstractClientApplicationBase implements IConfidentialClientApplication {
private ClientAuthentication clientAuthentication;
private CustomJWTAuthentication customJWTAuthentication;
private boolean clientCertAuthentication = false;
private ClientCertificate clientCertificate;
private boolean sendX5c;
private final String username;
private final String password;
private OauthClientApplication(OauthClientApplication.Builder builder) {
super(builder);
validateNotNull("username", builder.username);
validateNotNull("password", builder.password);
sendX5c = builder.sendX5c;
log = LoggerFactory.getLogger(ConfidentialClientApplication.class);
initClientAuthentication(builder.clientCredential);
this.username = builder.username;
this.password = builder.password;
}
@Override
public CompletableFuture<IAuthenticationResult> acquireToken(ClientCredentialParameters parameters) {
validateNotNull("parameters", parameters);
RequestContext context = new RequestContext(this, PublicApi.ACQUIRE_TOKEN_FOR_CLIENT, parameters);
OauthCredentialRequest clientCredentialRequest = new OauthCredentialRequest(parameters,
username, password,this, context);
return this.executeRequest(clientCredentialRequest);
}
@Override
public CompletableFuture<IAuthenticationResult> acquireToken(OnBehalfOfParameters parameters) {
throw new IllegalStateException("Use ConfidentialClientApplication instead");
}
private void initClientAuthentication(IClientCredential clientCredential) {
validateNotNull("clientCredential", clientCredential);
if (clientCredential instanceof ClientSecret) {
clientAuthentication = new ClientSecretPost(new ClientID(clientId()), new Secret(((ClientSecret) clientCredential).clientSecret()));
} else if (clientCredential instanceof ClientCertificate) {
this.clientCertAuthentication = true;
this.clientCertificate = (ClientCertificate) clientCredential;
clientAuthentication = buildValidClientCertificateAuthority();
} else if (clientCredential instanceof ClientAssertion) {
clientAuthentication = createClientAuthFromClientAssertion((ClientAssertion) clientCredential);
} else {
throw new IllegalArgumentException("Unsupported client credential");
}
}
@Override
protected ClientAuthentication clientAuthentication() {
if (clientCertAuthentication) {
final Date currentDateTime = new Date(System.currentTimeMillis());
final Date expirationTime = ((PrivateKeyJWT) clientAuthentication).getJWTAuthenticationClaimsSet().getExpirationTime();
if (expirationTime.before(currentDateTime)) {
//The asserted private jwt with the client certificate can expire so rebuild it when the
clientAuthentication = buildValidClientCertificateAuthority();
}
}
return clientAuthentication;
}
private ClientAuthentication buildValidClientCertificateAuthority() {
ClientAssertion clientAssertion = JwtHelper.buildJwt(clientId(), clientCertificate, this.authenticationAuthority.selfSignedJwtAudience(), sendX5c);
return createClientAuthFromClientAssertion(clientAssertion);
}
private ClientAuthentication createClientAuthFromClientAssertion(final ClientAssertion clientAssertion) {
final Map<String, List<String>> map = new HashMap<>();
try {
map.put("client_assertion_type", Collections.singletonList(ClientAssertion.assertionType));
map.put("client_assertion", Collections.singletonList(clientAssertion.assertion()));
return PrivateKeyJWT.parse(map);
} catch (final ParseException e) {
//This library is not supposed to validate Issuer and subject values.
//The next lines of code ensures that exception is not thrown.
if (e.getMessage().contains("Issuer and subject in client JWT assertion must designate the same client identifier")) {
return new CustomJWTAuthentication(ClientAuthenticationMethod.PRIVATE_KEY_JWT, clientAssertion, new ClientID(clientId()));
}
throw new MsalClientException(e);
}
}
/**
* Creates instance of Builder of ConfidentialClientApplication
*
* @param clientId Client ID (Application ID) of the application as registered
* in the application registration portal (portal.azure.com)
* @param clientCredential The client credential to use for token acquisition.
* @return instance of Builder of ConfidentialClientApplication
*/
public static OauthClientApplication.Builder builder(String clientId, IClientCredential clientCredential, String username, String password) {
return new OauthClientApplication.Builder(clientId, clientCredential, username, password);
}
public static class Builder extends AbstractClientApplicationBase.Builder<OauthClientApplication.Builder> {
private IClientCredential clientCredential;
private final String username;
private final String password;
private boolean sendX5c = true;
private Builder(String clientId, IClientCredential clientCredential, String username, String password) {
super(clientId);
this.clientCredential = clientCredential;
this.username = username;
this.password = password;
}
/**
* Specifies if the x5c claim (public key of the certificate) should be sent to the STS.
* Default value is true
*
* @param val true if the x5c should be sent. Otherwise false
* @return instance of the Builder on which method was called
*/
public OauthClientApplication.Builder sendX5c(boolean val) {
this.sendX5c = val;
return self();
}
@Override
public OauthClientApplication build() {
return new OauthClientApplication(this);
}
@Override
protected OauthClientApplication.Builder self() {
return this;
}
}
@java.lang.SuppressWarnings("all")
public boolean sendX5c() {
return this.sendX5c;
}
}

View File

@@ -0,0 +1,20 @@
package com.microsoft.aad.msal4j;
import com.nimbusds.oauth2.sdk.ResourceOwnerPasswordCredentialsGrant;
import com.nimbusds.oauth2.sdk.auth.Secret;
class OauthCredentialRequest extends MsalRequest {
ClientCredentialParameters parameters;
OauthCredentialRequest(ClientCredentialParameters parameters, String username, String password,
OauthClientApplication application, RequestContext requestContext) {
super(application, createMsalGrant(parameters, username, password), requestContext);
this.parameters = parameters;
}
private static OAuthAuthorizationGrant createMsalGrant(ClientCredentialParameters parameters,
String username, String password) {
return new OAuthAuthorizationGrant(new ResourceOwnerPasswordCredentialsGrant(username, new Secret(
password)), parameters.scopes(), parameters.claims());
}
}

View File

@@ -13,14 +13,12 @@
package org.talend.ms.crm.odata.authentication;
import java.net.Proxy;
import java.util.Collections;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import javax.naming.AuthenticationException;
import javax.naming.ServiceUnavailableException;
import com.microsoft.aad.adal4j.ClientCredential;
import org.apache.http.client.methods.HttpRequestBase;
import org.apache.olingo.client.api.communication.request.ODataRequest;
import org.apache.olingo.commons.api.http.HttpHeader;
@@ -28,15 +26,19 @@ import org.talend.ms.crm.odata.ClientConfiguration;
import org.talend.ms.crm.odata.ProxyProvider;
import org.talend.ms.crm.odata.httpclientfactory.IHttpclientFactoryObservable;
import org.talend.ms.crm.odata.httpclientfactory.OAuthHttpClientFactory;
import com.microsoft.aad.adal4j.AuthenticationContext;
import com.microsoft.aad.adal4j.AuthenticationResult;
import com.microsoft.aad.msal4j.ClientCredentialFactory;
import com.microsoft.aad.msal4j.ClientCredentialParameters;
import com.microsoft.aad.msal4j.ConfidentialClientApplication;
import com.microsoft.aad.msal4j.IAuthenticationResult;
import com.microsoft.aad.msal4j.OauthClientApplication;
import com.microsoft.aad.msal4j.PublicClientApplication;
import com.microsoft.aad.msal4j.UserNamePasswordParameters;
public class OAuthStrategyImpl implements IAuthStrategy {
private ClientConfiguration conf;
private AuthenticationResult authResult;
private IAuthenticationResult authResult;
private IHttpclientFactoryObservable httpClientFactory;
@@ -71,12 +73,12 @@ public class OAuthStrategyImpl implements IAuthStrategy {
@Override
public void configureRequest(ODataRequest request) {
request.addCustomHeader(HttpHeader.AUTHORIZATION, "Bearer " + authResult.getAccessToken());
request.addCustomHeader(HttpHeader.AUTHORIZATION, "Bearer " + authResult.accessToken());
}
@Override
public void configureRequest(HttpRequestBase request) {
request.addHeader(HttpHeader.AUTHORIZATION, "Bearer " + authResult.getAccessToken());
request.addHeader(HttpHeader.AUTHORIZATION, "Bearer " + authResult.accessToken());
}
@Override
@@ -115,34 +117,71 @@ public class OAuthStrategyImpl implements IAuthStrategy {
}
}
private Future<AuthenticationResult> acquireToken(AuthenticationContext context) throws Exception {
Future<AuthenticationResult> future;
private Future<IAuthenticationResult> acquireToken(PublicClientApplication context) throws Exception {
Future<IAuthenticationResult> future;
UserNamePasswordParameters parameters = UserNamePasswordParameters.builder(
Collections.singleton(conf.getResource() + "/.default"), conf.getUserName(), conf.getPassword().toCharArray()).build();
future = context.acquireToken(parameters);
return future;
if(conf.getAppRegisteredType() == ClientConfiguration.AppRegisteredType.NATIVE_APP){
future = context.acquireToken(conf.getResource(), conf.getClientId(), conf.getUserName(), conf.getPassword(), null);
}
else if(conf.getAppRegisteredType() == ClientConfiguration.AppRegisteredType.WEB_APP && conf.getWebAppPermission() == ClientConfiguration.WebAppPermission.DELEGATED){
future = context.acquireToken(conf.getResource(), new ClientCredential(conf.getClientId(), conf.getClientSecret()), conf.getUserName(), conf.getPassword(), null);
}
else{
throw new Exception("Can't retrieve token with this configuration : registered application type: "+conf.getAppRegisteredType()+", Web application permission: "+conf.getWebAppPermission());
}
return future;
}
private Future<IAuthenticationResult> acquireToken(OauthClientApplication context) throws Exception {
ClientCredentialParameters parameters = ClientCredentialParameters.builder(
Collections.singleton(conf.getResource() + "/.default")).build();
return context.acquireToken(parameters);
}
private AuthenticationResult getAccessToken() throws ServiceUnavailableException {
AuthenticationContext context = null;
AuthenticationResult result = null;
private IAuthenticationResult getAccessToken() throws ServiceUnavailableException {
if(conf.getAppRegisteredType() == ClientConfiguration.AppRegisteredType.NATIVE_APP){
return getAccessTokenNative();
} if(conf.getAppRegisteredType() == ClientConfiguration.AppRegisteredType.WEB_APP && conf.getWebAppPermission() == ClientConfiguration.WebAppPermission.DELEGATED){
return getAccessTokenWebApp();
} else {
throw new RuntimeException("Can't retrieve token with this configuration : registered application type: "+conf.getAppRegisteredType()+", Web application permission: "+conf.getWebAppPermission());
}
}
private IAuthenticationResult getAccessTokenNative() throws ServiceUnavailableException {
PublicClientApplication context = null;
IAuthenticationResult result = null;
ExecutorService service = null;
try {
service = Executors.newFixedThreadPool(1);
context = new AuthenticationContext(conf.getAuthoryEndpoint(), false, service);
Proxy proxy = ProxyProvider.getProxy();
PublicClientApplication.Builder contextBuilder = PublicClientApplication.builder(conf.getClientId()).authority("https://login.microsoftonline.com/organizations");
if (proxy != null) {
contextBuilder = contextBuilder.proxy(proxy);
}
context = contextBuilder.build();
Future<IAuthenticationResult> future = this.acquireToken(context);
result = future.get();
} catch (Exception e) {
throw new ServiceUnavailableException(e.getMessage());
} finally {
service.shutdown();
}
if (result == null) {
throw new ServiceUnavailableException("Authenticated failed! Please check your configuration!");
}
return result;
}
private IAuthenticationResult getAccessTokenWebApp() throws ServiceUnavailableException {
OauthClientApplication context = null;
IAuthenticationResult result = null;
ExecutorService service = null;
try {
service = Executors.newFixedThreadPool(1);
OauthClientApplication.Builder contextBuilder = OauthClientApplication.builder(conf.getClientId(),
ClientCredentialFactory.createFromSecret(conf.getClientSecret()), conf.getUserName(), conf.getPassword())
.authority(conf.getAuthoryEndpoint());
Proxy proxy = ProxyProvider.getProxy();
if (proxy != null) {
context.setProxy(proxy);
contextBuilder.proxy(proxy);
}
Future<AuthenticationResult> future = this.acquireToken(context);
context = contextBuilder.build();
Future<IAuthenticationResult> future = this.acquireToken(context);
result = future.get();
} catch (Exception e) {
throw new ServiceUnavailableException(e.getMessage());

View File

@@ -65,11 +65,6 @@
<artifactId>poi</artifactId>
<version>4.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
<version>4.1.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
<dependency>
<groupId>org.apache.poi</groupId>

View File

@@ -5,7 +5,7 @@
<groupId>org.talend</groupId>
<artifactId>talendMQConnectionUtil</artifactId>
<version>1.1.0-20220307</version>
<version>1.2.0-20220707</version>
<packaging>jar</packaging>
<name>talendMQConnectionUtil</name>
@@ -64,7 +64,7 @@
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>com.ibm.mq.allclient</artifactId>
<version>9.2.4.0</version>
<version>9.2.5.0</version>
</dependency>
<dependency>
<groupId>javax.resource</groupId>
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.talend</groupId>
<artifactId>talendMQRFH2</artifactId>
<version>1.1.0-20220307</version>
<version>1.2.0-20220707</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>

View File

@@ -58,12 +58,31 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
<version>4.1.2</version>
<version>5.2.2</version>
</dependency>
<dependency>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
<version>1.2.19</version>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.17.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>

View File

@@ -0,0 +1,29 @@
package org.talend.msg.utils;
import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import java.io.File;
import java.io.IOException;
public class MsgMailUtilTest {
@Rule
public TemporaryFolder folder = new TemporaryFolder();
@Test
public void test() throws IOException, ChunkNotFoundException {
File outDir = folder.newFolder("out");
MsgMailUtil msgMailUtil_tFileInputMail_1 = new MsgMailUtil(this.getClass().getClassLoader().getResource("test.msg").getPath(),
outDir.getAbsolutePath());
msgMailUtil_tFileInputMail_1.getAttachments();
Assert.assertEquals("Chaudhari,Pankaj", msgMailUtil_tFileInputMail_1.processMessage("From"));
}
}

View File

@@ -49,7 +49,7 @@ TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.NONE=\u30C7\u30D5\u30A9\u30EB\u30C8
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D

View File

@@ -13,7 +13,7 @@ TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.NONE=\u306A\u3057
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3

View File

@@ -118,7 +118,7 @@
<IMPORT NAME="Driver-JACKCESS" MODULE="jackcess-2.1.12.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess/2.1.12" REQUIRED="true"/>
<IMPORT NAME="jackcess-encrypt-2.1.4" MODULE="jackcess-encrypt-2.1.4.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess-encrypt/2.1.4" REQUIRED="true"/>
<IMPORT NAME="bcprov-jdk15on-1.69" MODULE="bcprov-jdk15on-1.69.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.69" REQUIRED="true"/>
<IMPORT NAME="bcprov-jdk15on-1.70" MODULE="bcprov-jdk15on-1.70.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.70" REQUIRED="true"/>
<IMPORT NAME="talend-ucanaccess-utils-1.0.0" MODULE="talend-ucanaccess-utils-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-ucanaccess-utils-1.0.0/6.4.0" REQUIRED="true"/>
<IMPORT NAME="common2.6" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" REQUIRED="true"/>

View File

@@ -121,7 +121,7 @@
<IMPORT NAME="Driver-JACKCESS" MODULE="jackcess-2.1.12.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess/2.1.12" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="jackcess-encrypt-2.1.4" MODULE="jackcess-encrypt-2.1.4.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess-encrypt/2.1.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="bcprov-jdk15on-1.69" MODULE="bcprov-jdk15on-1.69.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.69" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="bcprov-jdk15on-1.70" MODULE="bcprov-jdk15on-1.70.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.70" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="talend-ucanaccess-utils-1.0.0" MODULE="talend-ucanaccess-utils-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-ucanaccess-utils-1.0.0/6.4.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="common2.6" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>

View File

@@ -207,7 +207,7 @@
<IMPORT NAME="Driver-JACKCESS" MODULE="jackcess-2.1.12.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess/2.1.12" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="jackcess-encrypt-2.1.4" MODULE="jackcess-encrypt-2.1.4.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess-encrypt/2.1.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="bcprov-jdk15on-1.69" MODULE="bcprov-jdk15on-1.69.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.69" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="bcprov-jdk15on-1.70" MODULE="bcprov-jdk15on-1.70.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.70" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="talend-ucanaccess-utils-1.0.0" MODULE="talend-ucanaccess-utils-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-ucanaccess-utils-1.0.0/6.4.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="common2.6" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>

View File

@@ -30,7 +30,7 @@ TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.NONE=\u30C7\u30D5\u30A9\u30EB\u30C8

View File

@@ -14,7 +14,7 @@ TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.NONE=\u306A\u3057
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3

View File

@@ -181,7 +181,7 @@
<IMPORT NAME="Driver-JACKCESS" MODULE="jackcess-2.1.12.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess/2.1.12" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="jackcess-encrypt-2.1.4" MODULE="jackcess-encrypt-2.1.4.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess-encrypt/2.1.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="bcprov-jdk15on-1.69" MODULE="bcprov-jdk15on-1.69.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.69" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="bcprov-jdk15on-1.70" MODULE="bcprov-jdk15on-1.70.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.70" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="talend-ucanaccess-utils-1.0.0" MODULE="talend-ucanaccess-utils-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-ucanaccess-utils-1.0.0/6.4.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="common2.6" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>

View File

@@ -51,7 +51,7 @@ TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.NONE=\u306A\u3057
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3

View File

@@ -228,8 +228,8 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar"
MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848"
<IMPORT NAME="aws-java-sdk-1.12.297.jar" MODULE="aws-java-sdk-1.12.297.jar"
MVN="mvn:com.amazonaws/aws-java-sdk/1.12.297"
REQUIRED="true" />
<IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"

View File

@@ -555,8 +555,8 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar"
MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848"
<IMPORT NAME="aws-java-sdk-1.12.297.jar" MODULE="aws-java-sdk-1.12.297.jar"
MVN="mvn:com.amazonaws/aws-java-sdk/1.12.297"
REQUIRED="true" />
<IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"

View File

@@ -126,9 +126,9 @@ SERVICE_ACCESS_SECURITY_GROUP.NAME=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AF\u30BB\u3
CLUSTER_FINAL_ID.NAME=\u30AF\u30E9\u30B9\u30BF\u30FCID
CLUSTER_FINAL_NAME.NAME=\u30AF\u30E9\u30B9\u30BF\u30FC\u540D
PREDICATES.NAME=\u8FF0\u8A9E
PREDICATES.ITEM.RUNNING=\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u8D77\u52D5
PREDICATES.ITEM.RUNNING_WITH_NAME=\u4E8B\u524D\u306B\u5B9A\u7FA9\u6E08\u307F\u306E\u540D\u524D\u3067\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u8D77\u52D5
PREDICATES.ITEM.RUNNING_WITH_ID=\u4E8B\u524D\u306B\u5B9A\u7FA9\u6E08\u307F\u306EID\u3067\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u8D77\u52D5
PREDICATES.ITEM.RUNNING=\u5B9F\u884C\u4E2D\u306E\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u30BF\u30FC
PREDICATES.ITEM.RUNNING_WITH_NAME=\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\u306E\u540D\u524D\u3067\u5B9F\u884C\u4E2D\u306E\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u30BF\u30FC
PREDICATES.ITEM.RUNNING_WITH_ID=\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\u306EID\u3067\u5B9F\u884C\u4E2D\u306E\u30AF\u30E9\u30B9\u30BF\u30FC
NAME_OF_CLUSTER.NAME=\u30AF\u30E9\u30B9\u30BF\u30FC\u540D
ID_OF_CLUSTER.NAME=\u30AF\u30E9\u30B9\u30BF\u30FCID
WAIT_FOR_CLUSTER_READY.NAME=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u6E96\u5099\u304C\u3067\u304D\u308B\u307E\u3067\u5F85\u6A5F

View File

@@ -285,8 +285,8 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar"
MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848"
<IMPORT NAME="aws-java-sdk-1.12.297.jar" MODULE="aws-java-sdk-1.12.297.jar"
MVN="mvn:com.amazonaws/aws-java-sdk/1.12.297"
REQUIRED="true" />
<IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"

View File

@@ -58,7 +58,7 @@ TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.NONE=\u306A\u3057
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3

View File

@@ -52,7 +52,7 @@ TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.NONE=\u306A\u3057
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3

View File

@@ -345,8 +345,8 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar"
MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848"
<IMPORT NAME="aws-java-sdk-1.12.297.jar" MODULE="aws-java-sdk-1.12.297.jar"
MVN="mvn:com.amazonaws/aws-java-sdk/1.12.297"
REQUIRED="true" />
<IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"

View File

@@ -395,7 +395,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -87,7 +87,7 @@ TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.NONE=\u306A\u3057
TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3

View File

@@ -218,7 +218,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -278,7 +278,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -349,7 +349,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -64,7 +64,7 @@ TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u306
TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.NONE=\u306A\u3057
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D

View File

@@ -334,7 +334,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -262,7 +262,7 @@
<IMPORT NAME="google-api-services-oauth2-v2-rev20200213-1.31.0.jar" MODULE="google-api-services-oauth2-v2-rev20200213-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-oauth2/v2-rev20200213-1.31.0" REQUIRED="true" />
<IMPORT NAME="google-api-services-bigquery-v2-rev20201030-1.31.0.jar" MODULE="google-api-services-bigquery-v2-rev20201030-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-bigquery/v2-rev20201030-1.31.0" REQUIRED="true" />
<IMPORT NAME="google-http-client-1.38.0.jar" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0" REQUIRED="true" />
<IMPORT NAME="google-oauth-client-1.31.0.jar" MODULE="google-oauth-client-1.31.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.31.0" REQUIRED="true" />
<IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED="true" />
<IMPORT NAME="google-http-client-jackson2-1.38.0.jar" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0" REQUIRED="true" />
<IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED="true" />
<IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
@@ -292,7 +292,7 @@
<IMPORT NAME="google-cloud-storage-1.104.0" MODULE="google-cloud-storage-1.104.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.104.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<!-- Transitive dependencies of google-cloud-storage -->
<IMPORT NAME="google-api-services-storage-v1-rev20201112-1.31.0" MODULE="google-api-services-storage-v1-rev20201112-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20201112-1.31.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED="true" />
<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED="true" />
<IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.3.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="protobuf-java-3.19.2" MODULE="protobuf-java-3.19.2.jar" MVN="mvn:com.google.protobuf/protobuf-java/3.19.2" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="error_prone_annotation-2.1.3" MODULE="error_prone_annotation-2.1.3.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.1.3" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />

View File

@@ -14,7 +14,7 @@ ACCESS_TOKEN.NAME=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
DATASET.NAME=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8
TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
CREATE_TABLE_IF_NOT_EXIST.NAME=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3057\u306A\u3051\u308C\u3070\u4F5C\u6210
CREATE_TABLE_IF_NOT_EXIST.NAME=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u4F5C\u6210
ACTION_ON_DATA.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
ACTION_ON_DATA.ITEM.APPEND=\u8FFD\u52A0
ACTION_ON_DATA.ITEM.TRUNCATE=\u5168\u524A\u9664

View File

@@ -35,7 +35,7 @@ USE_CUSTOM_NULL_MARKER.NAME=\u4F7F\u7528\u81EA\u5B9A\u4E49 null \u6807\u8BB0
CUSTOM_NULL_MARKER.NAME=
DROP.NAME=\u5982\u679C\u8868\u5B58\u5728\u5219\u5220\u9664
DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
AUTH_TYPE.NAME=\u51ED\u8BC1\u7C7B\u578B
AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
GS_SERVICE_ACCOUNT_KEY.NAME=\u670D\u52A1\u5E10\u6237\u5BC6\u94A5
GS_ACCESS_TOKEN.NAME=OAuth \u8BBF\u95EE\u4EE4\u724C

View File

@@ -205,7 +205,7 @@
<IMPORT NAME="google-api-services-oauth2-v2-rev20200213-1.31.0.jar" MODULE="google-api-services-oauth2-v2-rev20200213-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-oauth2/v2-rev20200213-1.31.0" REQUIRED="true" />
<IMPORT NAME="google-api-services-bigquery-v2-rev20201030-1.31.0.jar" MODULE="google-api-services-bigquery-v2-rev20201030-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-bigquery/v2-rev20201030-1.31.0" REQUIRED="true" />
<IMPORT NAME="google-http-client-1.38.0.jar" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0" REQUIRED="true" />
<IMPORT NAME="google-oauth-client-1.31.0.jar" MODULE="google-oauth-client-1.31.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.31.0" REQUIRED="true" />
<IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED="true" />
<IMPORT NAME="google-http-client-jackson2-1.38.0.jar" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0" REQUIRED="true" />
<IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED="true" />
<IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
@@ -228,7 +228,7 @@
<IMPORT NAME="opencensus-api-0.24.0" MODULE="opencensus-api-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.24.0" REQUIRED="true" />
<IMPORT NAME="opencensus-contrib-http-util-0.24.0" MODULE="opencensus-contrib-http-util-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.24.0" REQUIRED="true" />
<IMPORT NAME="grpc-context-1.22.1" MODULE="grpc-context-1.22.1.jar" MVN="mvn:io.grpc/grpc-context/1.22.1" REQUIRED="true" />
<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
</IMPORTS>
</CODEGENERATION>
<RETURNS>

View File

@@ -282,6 +282,13 @@
<DEFAULT>"\""</DEFAULT>
</PARAMETER>
<PARAMETER NAME="USE_CUSTOM_NULL_MARKER" FIELD="CHECK" NUM_ROW="35">
<DEFAULT>false</DEFAULT>
</PARAMETER>
<PARAMETER NAME="CUSTOM_NULL_MARKER" FIELD="TEXT" NUM_ROW="35" SHOW_IF="USE_CUSTOM_NULL_MARKER=='true'">
<DEFAULT>""</DEFAULT>
</PARAMETER>
<PARAMETER NAME="CREATE" FIELD="CHECK" REQUIRED="true" NUM_ROW="40">
<DEFAULT>true</DEFAULT>
</PARAMETER>
@@ -367,6 +374,11 @@
<TEMPLATE_PARAM SOURCE="self.TEXT_ENCLOSURE" TARGET="tBQOB.TEXT_ENCLOSURE" />
<TEMPLATE_PARAM SOURCE="self.USE_CUSTOM_NULL_MARKER" TARGET="tBQOB.USE_CUSTOM_NULL_MARKER" />
<TEMPLATE_PARAM SOURCE="self.CUSTOM_NULL_MARKER" TARGET="tBQOB.CUSTOM_NULL_MARKER" />
<TEMPLATE_PARAM SOURCE="self.USE_CUSTOM_NULL_MARKER" TARGET="tBQBE.USE_CUSTOM_NULL_MARKER" />
<TEMPLATE_PARAM SOURCE="self.CUSTOM_NULL_MARKER" TARGET="tBQBE.CUSTOM_NULL_MARKER" />
<TEMPLATE_PARAM SOURCE="self.SCHEMA" TARGET="tBQOB.SCHEMA" />
<TEMPLATE_PARAM SOURCE="self.SCHEMA" TARGET="tBQBE.SCHEMA" />

View File

@@ -55,3 +55,5 @@ GS_ACCESS_TOKEN.NAME=OAuth Access Token
JOBID.NAME=BigQuery JobId
STATISTICS.NAME=Statistics of the main query
USE_12_HOUR_FORMAT.NAME=Use 12-hour format for dynamic columns
USE_CUSTOM_NULL_MARKER.NAME=Use custom null marker
CUSTOM_NULL_MARKER.NAME=

View File

@@ -55,3 +55,5 @@ GS_ACCESS_TOKEN.NAME=Jeton d'acc\u00E8s OAuth
JOBID.NAME=ID du Job BigQuery
STATISTICS.NAME=Statistiques de la requ\u00EAte principale
USE_12_HOUR_FORMAT.NAME=Utiliser le format 12\u00A0heures pour les colonnes dynamiques
USE_CUSTOM_NULL_MARKER.NAME=Utiliser un marqueur personnalis\u00E9 pour les nulls
CUSTOM_NULL_MARKER.NAME=

View File

@@ -29,7 +29,7 @@ ACCESS_TOKEN.NAME=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
DATASET.NAME=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8
TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
CREATE_TABLE_IF_NOT_EXIST.NAME=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3057\u306A\u3051\u308C\u3070\u4F5C\u6210
CREATE_TABLE_IF_NOT_EXIST.NAME=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u4F5C\u6210
ACTION_ON_DATA.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
ACTION_ON_DATA.ITEM.APPEND=\u8FFD\u52A0
ACTION_ON_DATA.ITEM.TRUNCATE=\u5168\u524A\u9664
@@ -55,3 +55,5 @@ GS_ACCESS_TOKEN.NAME=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
JOBID.NAME=BigQuery JobId
STATISTICS.NAME=\u30E1\u30A4\u30F3\u30AF\u30A8\u30EA\u30FC\u306E\u7D71\u8A08
USE_12_HOUR_FORMAT.NAME=\u30C0\u30A4\u30CA\u30DF\u30C3\u30AF\u30AB\u30E9\u30E0\u306B\u306F12\u6642\u9593\u5F62\u5F0F\u3092\u4F7F\u7528
USE_CUSTOM_NULL_MARKER.NAME=\u30AB\u30B9\u30BF\u30E0Null\u30DE\u30FC\u30AB\u30FC\u306E\u4F7F\u7528
CUSTOM_NULL_MARKER.NAME=

View File

@@ -47,7 +47,7 @@ FIELD_DELIMITER.NAME=
TOKEN_NAME.NAME=\u4EE4\u724C\u5C5E\u6027\u6587\u4EF6\u540D
CHECK_DISK_SPACE.NAME=\u68C0\u67E5\u78C1\u76D8\u7A7A\u95F4
DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
AUTH_TYPE.NAME=\u51ED\u8BC1\u7C7B\u578B
AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
AUTH_TYPE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
GS_SERVICE_ACCOUNT_KEY.NAME=\u670D\u52A1\u5E10\u6237\u5BC6\u94A5
@@ -55,3 +55,5 @@ GS_ACCESS_TOKEN.NAME=OAuth \u8BBF\u95EE\u4EE4\u724C
JOBID.NAME=BigQuery JobId
STATISTICS.NAME=\u4E3B\u67E5\u8BE2\u7EDF\u8BA1
USE_12_HOUR_FORMAT.NAME=\u5BF9\u52A8\u6001\u5217\u91C7\u7528 12 \u5C0F\u65F6\u683C\u5F0F
USE_CUSTOM_NULL_MARKER.NAME=\u4F7F\u7528\u81EA\u5B9A\u4E49 null \u6807\u8BB0
CUSTOM_NULL_MARKER.NAME=

View File

@@ -191,7 +191,7 @@
<IMPORT NAME="google-api-services-oauth2-v2-rev20200213-1.31.0.jar" MODULE="google-api-services-oauth2-v2-rev20200213-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-oauth2/v2-rev20200213-1.31.0" REQUIRED="true" />
<IMPORT NAME="google-api-services-bigquery-v2-rev20201030-1.31.0.jar" MODULE="google-api-services-bigquery-v2-rev20201030-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-bigquery/v2-rev20201030-1.31.0" REQUIRED="true" />
<IMPORT NAME="google-http-client-1.38.0.jar" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0" REQUIRED="true" />
<IMPORT NAME="google-oauth-client-1.31.0.jar" MODULE="google-oauth-client-1.31.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.31.0" REQUIRED="true" />
<IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED="true" />
<IMPORT NAME="google-http-client-jackson2-1.38.0.jar" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0" REQUIRED="true" />
<IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED="true"/>
<IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
@@ -233,7 +233,7 @@
<IMPORT NAME="opencensus-api-0.24.0" MODULE="opencensus-api-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.24.0" REQUIRED="true" />
<IMPORT NAME="opencensus-contrib-http-util-0.24.0" MODULE="opencensus-contrib-http-util-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.24.0" REQUIRED="true" />
<IMPORT NAME="grpc-context-1.22.1" MODULE="grpc-context-1.22.1.jar" MVN="mvn:io.grpc/grpc-context/1.22.1" REQUIRED="true" />
<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
</IMPORTS>
</CODEGENERATION>
<RETURNS>

View File

@@ -26,7 +26,7 @@ BONITA_ENVIRONMENT_FILE.NAME =Bonita\u30E9\u30F3\u30BF\u30A4\u30E0\u74B0\u5883\u
JASS_STANDARD_FILE.NAME=Bonita\u30E9\u30F3\u30BF\u30A4\u30E0JAAS\u30D5\u30A1\u30A4\u30EB
LOGGING_FILE.NAME =Bonita\u30E9\u30F3\u30BF\u30A4\u30E0\u30ED\u30B0\u30D5\u30A1\u30A4\u30EB
USE_PROCESS_ID.NAME=\u30D7\u30ED\u30BB\u30B9ID\u306E\u4F7F\u7528
USE_PROCESS_ID.NAME=\u30D7\u30ED\u30BB\u30B9ID\u3092\u4F7F\u7528
PROCESS_NAME.NAME=\u30D7\u30ED\u30BB\u30B9\u540D
PROCESS_VERSION.NAME=\u30D7\u30ED\u30BB\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
LOGIN_MODULE.NAME=\u30ED\u30B0\u30A4\u30F3\u30E2\u30B8\u30E5\u30FC\u30EB

View File

@@ -163,29 +163,31 @@ COMPATIBILITY="ALL"
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="aopalliance-1_0" MODULE="aopalliance-1.0.jar" MVN="mvn:aopalliance/aopalliance/1.0" UrlPath="platform:/plugin/org.talend.libraries.esb/lib/aopalliance-1.0.jar" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="aws-ec2-2_0_2" MODULE="aws-ec2-2.0.2.jar" MVN="mvn:org.talend.libraries/aws-ec2-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="commons-io-2.8.0" MODULE="commons-io-2.8.0.jar" MVN="mvn:commons-io/commons-io/2.8.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="ec2-2_0_2" MODULE="ec2-2.0.2.jar" MVN="mvn:org.talend.libraries/ec2-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="gson-2_2" MODULE="gson-2.2.jar" MVN="mvn:org.talend.libraries/gson-2.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="guava-16.0.1" MODULE="guava-16.0.1.jar" MVN="mvn:com.google.guava/guava/16.0.1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="guice-3_0" MODULE="guice-3.0.jar" MVN="mvn:com.google.inject/guice/3.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="guice-assistedinject-3_0" MODULE="guice-assistedinject-3.0.jar" MVN="mvn:org.talend.libraries/guice-assistedinject-3.0/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="javax_inject-1" MODULE="javax.inject-1.jar" MVN="mvn:javax.inject/javax.inject/1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-bouncycastle-2_0_2" MODULE="jclouds-bouncycastle-2.0.2.jar" MVN="mvn:org.talend.libraries/jclouds-bouncycastle-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-compute-2_0_2" MODULE="jclouds-compute-2.0.2.jar" MVN="mvn:org.talend.libraries/jclouds-compute-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-core-2_0_2" MODULE="jclouds-core-2.0.2.jar" MVN="mvn:org.talend.libraries/jclouds-core-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-scriptbuilder-2_0_2" MODULE="jclouds-scriptbuilder-2.0.2.jar" MVN="mvn:org.talend.libraries/jclouds-scriptbuilder-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-slf4j-2_0_2" MODULE="jclouds-slf4j-2.0.2.jar" MVN="mvn:org.talend.libraries/jclouds-slf4j-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-sshj-2_0_2" MODULE="jclouds-sshj-2.0.2.jar" MVN="mvn:org.talend.libraries/jclouds-sshj-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jsr250-api-1_0" MODULE="jsr250-api-1.0.jar" MVN="mvn:org.talend.libraries/jsr250-api-1.0/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jsr311-api-1_1_1" MODULE="jsr311-api-1.1.1.jar" MVN="mvn:org.talend.libraries/jsr311-api-1.1.1/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="rocoto-6_1" MODULE="rocoto-6.1.jar" MVN="mvn:org.talend.libraries/rocoto-6.1/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="slf4j-api-1_7_2" MODULE="slf4j-api-1.7.2.jar" MVN="mvn:org.talend.libraries/slf4j-api-1.7.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="sshj-0_8_1" MODULE="sshj-0.8.1.jar" MVN="mvn:org.talend.libraries/sshj-0.8.1/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="sts-2.0.2" MODULE="sts-2.0.2.jar" MVN="mvn:org.talend.libraries/sts-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jaxb-api-2.3.1" MODULE="jaxb-api-2.3.1.jar" MVN="mvn:javax.xml.bind/jaxb-api/2.3.1" REQUIRED="true"/>
<IMPORT NAME="aws-ec2" MODULE="aws-ec2-2.5.0.jar" MVN="mvn:org.apache.jclouds.provider/aws-ec2/2.5.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="ec2" MODULE="ec2-2.5.0.jar" MVN="mvn:org.apache.jclouds.api/ec2/2.5.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="sts" MODULE="sts-2.5.0.jar" MVN="mvn:org.apache.jclouds.api/sts/2.5.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-core" MODULE="jclouds-core-2.5.0.jar" MVN="mvn:org.apache.jclouds/jclouds-core/2.5.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="guava" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="failureaccess" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="listenablefuture" MODULE="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" MVN="mvn:com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jsr305" MODULE="jsr305-3.0.2.jar" MVN="mvn:com.google.code.findbugs/jsr305/3.0.2" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="checker-qual" MODULE="checker-qual-2.5.2.jar" MVN="mvn:org.checkerframework/checker-qual/2.5.2" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="error_prone_annotations" MODULE="error_prone_annotations-2.2.0.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.2.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="j2objc-annotations" MODULE="j2objc-annotations-1.1.jar" MVN="mvn:com.google.j2objc/j2objc-annotations/1.1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="animal-sniffer-annotations" MODULE="animal-sniffer-annotations-1.17.jar" MVN="mvn:org.codehaus.mojo/animal-sniffer-annotations/1.17" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="guice" MODULE="guice-5.0.1.jar" MVN="mvn:com.google.inject/guice/5.0.1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="javax.inject" MODULE="javax.inject-1.jar" MVN="mvn:javax.inject/javax.inject/1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="aopalliance" MODULE="aopalliance-1.0.jar" MVN="mvn:aopalliance/aopalliance/1.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="guice-assistedinject" MODULE="guice-assistedinject-5.0.1.jar" MVN="mvn:com.google.inject.extensions/guice-assistedinject/5.0.1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="javax.ws.rs-api" MODULE="javax.ws.rs-api-2.0.1.jar" MVN="mvn:javax.ws.rs/javax.ws.rs-api/2.0.1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.2.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.2" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jaxb-impl" MODULE="jaxb-impl-2.3.3.jar" MVN="mvn:com.sun.xml.bind/jaxb-impl/2.3.3" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jakarta.xml.bind-api" MODULE="jakarta.xml.bind-api-2.3.3.jar" MVN="mvn:jakarta.xml.bind/jakarta.xml.bind-api/2.3.3" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jakarta.activation" MODULE="jakarta.activation-1.2.2.jar" MVN="mvn:com.sun.activation/jakarta.activation/1.2.2" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-compute" MODULE="jclouds-compute-2.5.0.jar" MVN="mvn:org.apache.jclouds/jclouds-compute/2.5.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-scriptbuilder" MODULE="jclouds-scriptbuilder-2.5.0.jar" MVN="mvn:org.apache.jclouds/jclouds-scriptbuilder/2.5.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jaxb-api-2.3.1" MODULE="jaxb-api-2.3.1.jar" MVN="mvn:javax.xml.bind/jaxb-api/2.3.1" REQUIRED="true"/>
</IMPORTS>
</CODEGENERATION>

View File

@@ -72,29 +72,31 @@ COMPATIBILITY="ALL"
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="aopalliance-1_0" MODULE="aopalliance-1.0.jar" MVN="mvn:aopalliance/aopalliance/1.0" UrlPath="platform:/plugin/org.talend.libraries.esb/lib/aopalliance-1.0.jar" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="aws-ec2-2_0_2" MODULE="aws-ec2-2.0.2.jar" MVN="mvn:org.talend.libraries/aws-ec2-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="commons-io-2.8.0" MODULE="commons-io-2.8.0.jar" MVN="mvn:commons-io/commons-io/2.8.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="ec2-2_0_2" MODULE="ec2-2.0.2.jar" MVN="mvn:org.talend.libraries/ec2-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="gson-2_2" MODULE="gson-2.2.jar" MVN="mvn:org.talend.libraries/gson-2.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="guava-16.0.1" MODULE="guava-16.0.1.jar" MVN="mvn:com.google.guava/guava/16.0.1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="guice-3_0" MODULE="guice-3.0.jar" MVN="mvn:com.google.inject/guice/3.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="guice-assistedinject-3_0" MODULE="guice-assistedinject-3.0.jar" MVN="mvn:org.talend.libraries/guice-assistedinject-3.0/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="javax_inject-1" MODULE="javax.inject-1.jar" MVN="mvn:javax.inject/javax.inject/1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-bouncycastle-2_0_2" MODULE="jclouds-bouncycastle-2.0.2.jar" MVN="mvn:org.talend.libraries/jclouds-bouncycastle-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-compute-2_0_2" MODULE="jclouds-compute-2.0.2.jar" MVN="mvn:org.talend.libraries/jclouds-compute-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-core-2_0_2" MODULE="jclouds-core-2.0.2.jar" MVN="mvn:org.talend.libraries/jclouds-core-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-scriptbuilder-2_0_2" MODULE="jclouds-scriptbuilder-2.0.2.jar" MVN="mvn:org.talend.libraries/jclouds-scriptbuilder-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-slf4j-2_0_2" MODULE="jclouds-slf4j-2.0.2.jar" MVN="mvn:org.talend.libraries/jclouds-slf4j-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-sshj-2_0_2" MODULE="jclouds-sshj-2.0.2.jar" MVN="mvn:org.talend.libraries/jclouds-sshj-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jsr250-api-1_0" MODULE="jsr250-api-1.0.jar" MVN="mvn:org.talend.libraries/jsr250-api-1.0/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jsr311-api-1_1_1" MODULE="jsr311-api-1.1.1.jar" MVN="mvn:org.talend.libraries/jsr311-api-1.1.1/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="rocoto-6_1" MODULE="rocoto-6.1.jar" MVN="mvn:org.talend.libraries/rocoto-6.1/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="slf4j-api-1_7_2" MODULE="slf4j-api-1.7.2.jar" MVN="mvn:org.talend.libraries/slf4j-api-1.7.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="sshj-0_8_1" MODULE="sshj-0.8.1.jar" MVN="mvn:org.talend.libraries/sshj-0.8.1/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="sts-2.0.2" MODULE="sts-2.0.2.jar" MVN="mvn:org.talend.libraries/sts-2.0.2/6.0.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jaxb-api-2.3.1" MODULE="jaxb-api-2.3.1.jar" MVN="mvn:javax.xml.bind/jaxb-api/2.3.1" REQUIRED="true"/>
<IMPORT NAME="aws-ec2" MODULE="aws-ec2-2.5.0.jar" MVN="mvn:org.apache.jclouds.provider/aws-ec2/2.5.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="ec2" MODULE="ec2-2.5.0.jar" MVN="mvn:org.apache.jclouds.api/ec2/2.5.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="sts" MODULE="sts-2.5.0.jar" MVN="mvn:org.apache.jclouds.api/sts/2.5.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-core" MODULE="jclouds-core-2.5.0.jar" MVN="mvn:org.apache.jclouds/jclouds-core/2.5.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="guava" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="failureaccess" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="listenablefuture" MODULE="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" MVN="mvn:com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jsr305" MODULE="jsr305-3.0.2.jar" MVN="mvn:com.google.code.findbugs/jsr305/3.0.2" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="checker-qual" MODULE="checker-qual-2.5.2.jar" MVN="mvn:org.checkerframework/checker-qual/2.5.2" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="error_prone_annotations" MODULE="error_prone_annotations-2.2.0.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.2.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="j2objc-annotations" MODULE="j2objc-annotations-1.1.jar" MVN="mvn:com.google.j2objc/j2objc-annotations/1.1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="animal-sniffer-annotations" MODULE="animal-sniffer-annotations-1.17.jar" MVN="mvn:org.codehaus.mojo/animal-sniffer-annotations/1.17" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="guice" MODULE="guice-5.0.1.jar" MVN="mvn:com.google.inject/guice/5.0.1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="javax.inject" MODULE="javax.inject-1.jar" MVN="mvn:javax.inject/javax.inject/1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="aopalliance" MODULE="aopalliance-1.0.jar" MVN="mvn:aopalliance/aopalliance/1.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="guice-assistedinject" MODULE="guice-assistedinject-5.0.1.jar" MVN="mvn:com.google.inject.extensions/guice-assistedinject/5.0.1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="javax.ws.rs-api" MODULE="javax.ws.rs-api-2.0.1.jar" MVN="mvn:javax.ws.rs/javax.ws.rs-api/2.0.1" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.2.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.2" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jaxb-impl" MODULE="jaxb-impl-2.3.3.jar" MVN="mvn:com.sun.xml.bind/jaxb-impl/2.3.3" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jakarta.xml.bind-api" MODULE="jakarta.xml.bind-api-2.3.3.jar" MVN="mvn:jakarta.xml.bind/jakarta.xml.bind-api/2.3.3" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jakarta.activation" MODULE="jakarta.activation-1.2.2.jar" MVN="mvn:com.sun.activation/jakarta.activation/1.2.2" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-compute" MODULE="jclouds-compute-2.5.0.jar" MVN="mvn:org.apache.jclouds/jclouds-compute/2.5.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jclouds-scriptbuilder" MODULE="jclouds-scriptbuilder-2.5.0.jar" MVN="mvn:org.apache.jclouds/jclouds-scriptbuilder/2.5.0" REQUIRED_IF="PROVIDER=='AWS_EC2'"/>
<IMPORT NAME="jaxb-api-2.3.1" MODULE="jaxb-api-2.3.1.jar" MVN="mvn:javax.xml.bind/jaxb-api/2.3.1" REQUIRED="true"/>
</IMPORTS>
</CODEGENERATION>

View File

@@ -99,7 +99,7 @@
}
%>
resumeUtil.addLog("NODE", "NODE:<%=cid %>", "", Thread.currentThread().getId() + "", "","","","",resumeUtil.convertToJsonText(context,parametersToEncrypt_<%=cid%>));
resumeUtil.addLog("NODE", "NODE:<%=cid %>", "", Thread.currentThread().getId() + "", "","","","",resumeUtil.convertToJsonText(context,ContextProperties.class,parametersToEncrypt_<%=cid%>));
<%if(isLog4jEnabled){%>
log.info("<%=cid%> - Loaded contexts count: " + nb_line_<%=cid %> + ".");
<%}%>

View File

@@ -95,7 +95,8 @@ if ((metadatas!=null)&&(metadatas.size()>0)) {
for (IContextParameter ctxParam: params) {
if ("id_Password".equals(ctxParam.getType()) ) {
%>
if ((key_<%=cid %> != null) && ("<%=ctxParam.getName()%>".equals(key_<%=cid %>)) ) currentValue_<%=cid %> = currentValue_<%=cid %>.replaceAll(".", "*");
if ((key_<%=cid %> != null) && ("<%=ctxParam.getName()%>".equals(key_<%=cid %>)) && (currentValue_<%=cid %> != null))
currentValue_<%=cid %> = currentValue_<%=cid %>.replaceAll(".", "*");
<%
}

View File

@@ -858,7 +858,7 @@
<IMPORT NAME="asm" MODULE="asm-9.1.jar" MVN="mvn:org.ow2.asm/asm/9.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="Driver-MYSQL5" MODULE="mysql-connector-java-5.1.49.jar" MVN="mvn:mysql/mysql-connector-java/5.1.49" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') and (DBTYPE=='MYSQL') and (DB_MYSQL_VERSION=='MYSQL_5')"/>
<IMPORT NAME="Driver-MYSQL8" MODULE="mysql-connector-java-8.0.18.jar" MVN="mvn:mysql/mysql-connector-java/8.0.18" REQUIRED_IF="(DB_MYSQL_VERSION == 'MYSQL_8') AND (USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MYSQL')" />
@@ -870,7 +870,7 @@
<IMPORT NAME="Driver-Oracle12c" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0" REQUIRED_IF="(DBTYPE=='DBORACLE') AND (DB_VERSION == 'ORACLE_12') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="ORACLE_18" MODULE="ojdbc8-19.3.0.0.jar" MVN="mvn:com.oracle.ojdbc/ojdbc8/19.3.0.0" REQUIRED_IF="(DBTYPE=='DBORACLE') AND (DB_VERSION == 'ORACLE_18') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-POSTGRESQL" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) AND (DB_POSTGRE_VERSION =='PRIOR_TO_V9')) or (DBTYPE=='GREENPLUM'))" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) AND (DB_POSTGRE_VERSION =='V9_X'))" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.26.jar" MVN="mvn:org.postgresql/postgresql/42.2.26" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) AND (DB_POSTGRE_VERSION =='V9_X'))" />
<IMPORT NAME="Driver-FIREBIRD" MODULE="jaybird-full-2.1.1.jar" MVN="mvn:org.talend.libraries/jaybird-full-2.1.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.jdbc.firebird/lib/jaybird-full-2.1.1.jar" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='FIREBIRD')" />
<IMPORT NAME="Driver-HSQLDb" MODULE="hsqldb.jar" MVN="mvn:org.talend.libraries/hsqldb/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.jdbc.hsql/lib/hsqldb.jar" REQUIRED_IF="DBTYPE=='HSQLDB'"/>
<IMPORT NAME="Driver-INFORMIX-JDBC" MODULE="ifxjdbc.jar" MVN="mvn:org.talend.libraries/ifxjdbc/6.0.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INFORMIX')" />

View File

@@ -132,7 +132,7 @@ MSSQL_DRIVER.ITEM.MSSQL_PROP=Microsoft
DB_SYBASE_VERSION.NAME=DB Version
DB_SYBASE_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) and above
ACCOUNT.NAME=Account
ROLE.NAME=Role
ENFORCE_DELIMITED_IDENTIFIERS.NAME=Enforce database delimited identifiers

View File

@@ -132,7 +132,7 @@ MSSQL_DRIVER.ITEM.MSSQL_PROP=Microsoft
DB_SYBASE_VERSION.NAME=Version de la base de donn\u00E9es
DB_SYBASE_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures
ACCOUNT.NAME=Compte
ROLE.NAME=R\u00F4le
ENFORCE_DELIMITED_IDENTIFIERS.NAME=Impl\u00E9menter les identifiants d\u00E9limit\u00E9s de base de donn\u00E9es

View File

@@ -59,13 +59,13 @@ MSSQL_ACTIVE_DIR_AUTH.NAME=Azure Active Directory\u3092\u4F7F\u3063\u3066\u8A8D\
RUNNING_MODE.ITEM.HSQLDB_INPROGRESS_PERSISTENT=\u51E6\u7406\u7D99\u7D9A\u4E2D\u306EHSQLD\uFF42
RUNNING_MODE.ITEM.HSQLDB_SERVER=HSQLDb\u30B5\u30FC\u30D0
RUNNING_MODE.ITEM.HSQLDB_WEBSERVER=HSQLDb Web\u30B5\u30FC\u30D0
RUNNING_MODE.NAME=\u30E9\u30F3\u30CB\u30F3\u30B0\u30E2\u30FC\u30C9
RUNNING_MODE.NAME=\u5B9F\u884C\u30E2\u30FC\u30C9
LOCAL_SERVICE_NAME.NAME=\u30ED\u30FC\u30AB\u30EB\u30B5\u30FC\u30D3\u30B9\u540D
SCHEMA_DB.NAME=\u30B9\u30AD\u30FC\u30DE
TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
TABLEACTION.ITEM.CREATE_IF_NOT_EXIST=\u30C6\u30FC\u30D6\u30EB\u304C\u306A\u3044\u5834\u5408\u306F\u4F5C\u6210
TABLEACTION.ITEM.CREATE_TABLE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
TABLEACTION.ITEM.DROP_IF_EXIST_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
TABLEACTION.ITEM.DROP_IF_EXIST_CREATE=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u4F5C\u6210
TABLEACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
TEMPTABLE.NAME=\u4E00\u6642\u30C6\u30FC\u30D6\u30EB
TLS.NAME=TLS/SSL\u30BD\u30B1\u30C3\u30C8\u3092\u4F7F\u7528
@@ -132,7 +132,7 @@ MSSQL_DRIVER.ITEM.MSSQL_PROP=Microsoft
DB_SYBASE_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
DB_SYBASE_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)\u4EE5\u964D
ACCOUNT.NAME=\u30A2\u30AB\u30A6\u30F3\u30C8
ROLE.NAME=\u30ED\u30FC\u30EB
ENFORCE_DELIMITED_IDENTIFIERS.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u533A\u5207\u308A\u4ED8\u304D\u8B58\u5225\u5B50\u306E\u5F37\u5236

View File

@@ -132,7 +132,7 @@ MSSQL_DRIVER.ITEM.MSSQL_PROP=Microsoft
DB_SYBASE_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
DB_SYBASE_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) \u53CA\u66F4\u9AD8\u7248\u672C
ACCOUNT.NAME=\u5E10\u6237
ROLE.NAME=\u89D2\u8272
ENFORCE_DELIMITED_IDENTIFIERS.NAME=\u6267\u884C\u6570\u636E\u5E93\u5206\u9694\u578B\u6807\u8BC6\u7B26

View File

@@ -20,7 +20,7 @@ TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.NONE=\u30C7\u30D5\u30A9\u30EB\u30C8
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3

View File

@@ -51,7 +51,7 @@ TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u306
TABLE_ACTION.ITEM.TRUNCATE_REUSE_STORAGE=Truncate table with reuse storage
TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.NONE=\u30C7\u30D5\u30A9\u30EB\u30C8
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3

View File

@@ -29,7 +29,7 @@ TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.NONE=\u30C7\u30D5\u30A9\u30EB\u30C8
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3

View File

@@ -175,8 +175,8 @@ while(<%=inputColumn%>_iterator_<%=cid %>.hasNext()){
}
}
denormalize_row_<%=cid %>.<%=inputColumn %> = sb_<%=cid %>.toString();
if (sb_<%=cid %> != null)
denormalize_row_<%=cid %>.<%=inputColumn %> = sb_<%=cid %>.toString();
sb_<%=cid %> = null;

View File

@@ -212,7 +212,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -47,7 +47,7 @@ TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.NONE=\u306A\u3057
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3

View File

@@ -189,8 +189,8 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="DB_VERSION =='V9_X'" />
<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="DB_VERSION =='PRIOR_TO_V9'" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.26.jar" MVN="mvn:org.postgresql/postgresql/42.2.26" REQUIRED_IF="DB_VERSION =='V9_X' AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="DB_VERSION =='PRIOR_TO_V9' AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -20,4 +20,4 @@ CONNECTION.NAME=Component List
DB_VERSION.NAME=DB Version
DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) and above

View File

@@ -20,4 +20,4 @@ CONNECTION.NAME=Liste des composants
DB_VERSION.NAME=Version de la base de donn\u00E9es
DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures

View File

@@ -20,4 +20,4 @@ CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)\u4EE5\u964D

View File

@@ -20,4 +20,4 @@ CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) \u53CA\u66F4\u9AD8\u7248\u672C

View File

@@ -55,7 +55,7 @@ TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u4F5C\u6210
TABLE_ACTION.ITEM.NONE=\u306A\u3057
TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3

View File

@@ -3,7 +3,7 @@ LIMIT.NAME=\u5236\u9650
LONG_NAME=JSON\u30D5\u30A3\u30FC\u30EB\u30C9\u5185\u306E\u7279\u5B9A\u306E\u30AB\u30E9\u30E0\u304B\u3089\u8907\u6570\u306E\u30AB\u30E9\u30E0\u3092\u751F\u6210\u3057\u307E\u3059
LOOP_QUERY.NAME=\u30EB\u30FC\u30D7 XPath\u30AF\u30A8\u30EA\u30FC
MAPPING.ITEM.QUERY=XPath\u30AF\u30A8\u30EA\u30FC
MAPPING.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u306E\u53D6\u5F97
MAPPING.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u3092\u53D6\u5F97
MAPPING.ITEM.ISARRAY=Array
MAPPING.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0
NB_LINE.NAME=\u884C\u6570

View File

@@ -3,7 +3,7 @@ LIMIT.NAME=\u5236\u9650
LONG_NAME=tFileInputXML\u3068\u3057\u3066\u5165\u529B\u884C\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u89E3\u6790\u3057\u307E\u3059
LOOP_QUERY.NAME=\u30EB\u30FC\u30D7 XPath\u30AF\u30A8\u30EA\u30FC
MAPPING.ITEM.QUERY=XPath\u30AF\u30A8\u30EA\u30FC
MAPPING.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u306E\u53D6\u5F97
MAPPING.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u3092\u53D6\u5F97
MAPPING.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0
NB_LINE.NAME=\u884C\u6570
REJECT.LINK=\u30EA\u30B8\u30A7\u30AF\u30C8

View File

@@ -5,6 +5,8 @@
org.talend.designer.codegen.config.CodeGeneratorArgument
org.talend.core.model.process.IElementParameter
org.talend.core.model.utils.NodeUtil
java.util.List
java.util.Map
"
%>
<%@ include file="../templates/Log4j/Log4jFileUtil.javajet"%>
@@ -36,6 +38,8 @@ String timeoutValue = ElementParameterParser.getValue(node, "__CONNECTION_TIMEOU
boolean useRemoteVerification = ("true").equals(ElementParameterParser.getValue(node, "__REMOTE_VERIFICATION__"));
boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.getProcess(), "__LOG4J_ACTIVATE__"));
boolean useStrictReplyParsing = ("true").equals(ElementParameterParser.getValue(node, "__USE_STRICT_REPLY_PARSING__"));
boolean isConfigClient = "true".equals(ElementParameterParser.getValue(node, "__CONFIG_CLIENT__"));
List<Map<String, String>> clientParams = (List<Map<String,String>>)ElementParameterParser.getObjectValue(node, "__CLIENT_PARAMETERS__");
String passwordFieldName = "";
if (useProxy) {

View File

@@ -244,11 +244,31 @@
NUM_ROW="100" REPOSITORY_VALUE="USE_STRICT_REPLY_PARSING">
<DEFAULT>true</DEFAULT>
</PARAMETER>
<PARAMETER
NAME="CONFIG_CLIENT"
FIELD="CHECK"
NUM_ROW="110"
SHOW_IF="SFTP == 'true'"
>
</PARAMETER>
<PARAMETER
NAME="CLIENT_PARAMETERS"
FIELD="TABLE"
NUM_ROW="120"
SHOW_IF="(CONFIG_CLIENT == 'true') AND (SFTP == 'true')"
>
<ITEMS>
<ITEM NAME="PARAMETER"></ITEM>
<ITEM NAME="VALUE"></ITEM>
</ITEMS>
</PARAMETER>
</ADVANCED_PARAMETERS>
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true')"/>
<IMPORT NAME="Java-SFTP" MODULE="jsch-0.2.1.jar" MVN="mvn:com.github.mwiede/jsch/0.2.1" REQUIRED_IF="(SFTP == 'true')"/>
<IMPORT NAME="Java-FTP+S" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(SFTP == 'false')" />
<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20200902.jar" MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20200902" REQUIRED_IF="(FTPS == 'true')" />
<IMPORT NAME="talend-proxy" MODULE="talend-proxy-1.0.2.jar" MVN="mvn:org.talend.components.lib/talend-proxy/1.0.2" REQUIRED="true" />

View File

@@ -36,3 +36,7 @@ SECURITY_MODE.ITEM.EXPLICIT=Explicit
USE_ENCODING.NAME=Filename encoding
CONNECTION_TIMEOUT.NAME=Connection timeout (milliseconds)
USE_STRICT_REPLY_PARSING.NAME=Use strict reply parsing
CONFIG_CLIENT.NAME=Config client
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=Client parameter
CLIENT_PARAMETERS.ITEM.VALUE=Value

View File

@@ -36,3 +36,7 @@ SECURITY_MODE.ITEM.EXPLICIT=Explicite
USE_ENCODING.NAME=Encodage du nom de fichier
CONNECTION_TIMEOUT.NAME=D\u00E9lai avant l'expiration de la connexion (millisecondes)
USE_STRICT_REPLY_PARSING.NAME=Utiliser le parsage de la r\u00E9ponse stricte
CONFIG_CLIENT.NAME=Config client
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=Param\u00E8tre client
CLIENT_PARAMETERS.ITEM.VALUE=Valeur

View File

@@ -35,4 +35,8 @@ SECURITY_MODE.ITEM.IMPLICIT=\u6697\u9ED9\u7684
SECURITY_MODE.ITEM.EXPLICIT=\u660E\u793A\u7684
USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
CONFIG_CLIENT.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u8A2D\u5B9A
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
CLIENT_PARAMETERS.ITEM.VALUE=\u5024

View File

@@ -36,3 +36,7 @@ SECURITY_MODE.ITEM.EXPLICIT=\u663E\u5F0F
USE_ENCODING.NAME=\u6587\u4EF6\u540D\u7F16\u7801
CONNECTION_TIMEOUT.NAME=\u8FDE\u63A5\u8D85\u65F6 (\u6BEB\u79D2)
USE_STRICT_REPLY_PARSING.NAME=\u4F7F\u7528\u4E25\u683C\u56DE\u590D\u89E3\u6790
CONFIG_CLIENT.NAME=\u914D\u7F6E\u5BA2\u6237\u7AEF
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=\u5BA2\u6237\u7AEF\u53C2\u6570
CLIENT_PARAMETERS.ITEM.VALUE=\u503C

View File

@@ -46,6 +46,8 @@ String protectionBufferSize = ElementParameterParser.getValue(node, "__FTPS_PROT
String timeoutValue = ElementParameterParser.getValue(node, "__CONNECTION_TIMEOUT__");
boolean useRemoteVerification = ("true").equals(ElementParameterParser.getValue(node, "__REMOTE_VERIFICATION__"));
boolean useStrictReplyParsing = ("true").equals(ElementParameterParser.getValue(node, "__USE_STRICT_REPLY_PARSING__"));
boolean isConfigClient = "true".equals(ElementParameterParser.getValue(node, "__CONFIG_CLIENT__"));
List<Map<String, String>> clientParams = (List<Map<String,String>>)ElementParameterParser.getObjectValue(node, "__CLIENT_PARAMETERS__");
if (("true").equals(useExistingConn)) {
List<? extends INode> nodeList = node.getProcess().getGeneratingNodes();

View File

@@ -299,11 +299,31 @@
NUM_ROW="100" SHOW_IF="USE_EXISTING_CONNECTION == 'false'" REPOSITORY_VALUE="USE_STRICT_REPLY_PARSING">
<DEFAULT>true</DEFAULT>
</PARAMETER>
<PARAMETER
NAME="CONFIG_CLIENT"
FIELD="CHECK"
NUM_ROW="110"
SHOW_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"
>
</PARAMETER>
<PARAMETER
NAME="CLIENT_PARAMETERS"
FIELD="TABLE"
NUM_ROW="120"
SHOW_IF="(CONFIG_CLIENT == 'true') AND (SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"
>
<ITEMS>
<ITEM NAME="PARAMETER"></ITEM>
<ITEM NAME="VALUE"></ITEM>
</ITEMS>
</PARAMETER>
</ADVANCED_PARAMETERS>
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="Java-SFTP" MODULE="jsch-0.2.1.jar" MVN="mvn:com.github.mwiede/jsch/0.2.1" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="jakarta-oro" MODULE="jakarta-oro-2.0.8.jar" MVN="mvn:org.talend.libraries/jakarta-oro-2.0.8/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache/lib/jakarta-oro-2.0.8.jar" REQUIRED="true" />
<IMPORT NAME="Java-FTP+S" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20200902.jar"

View File

@@ -51,3 +51,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=Move to the current directory
USE_ENCODING.NAME=Filename encoding
CONNECTION_TIMEOUT.NAME=Connection timeout (milliseconds)
USE_STRICT_REPLY_PARSING.NAME=Use strict reply parsing
CONFIG_CLIENT.NAME=Config client
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=Client parameter
CLIENT_PARAMETERS.ITEM.VALUE=Value

View File

@@ -51,3 +51,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=D\u00E9placer vers le r\u00E9pertoire courant
USE_ENCODING.NAME=Encodage du nom de fichier
CONNECTION_TIMEOUT.NAME=D\u00E9lai avant l'expiration de la connexion (millisecondes)
USE_STRICT_REPLY_PARSING.NAME=Utiliser le parsage de la r\u00E9ponse stricte
CONFIG_CLIENT.NAME=Config client
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=Param\u00E8tre client
CLIENT_PARAMETERS.ITEM.VALUE=Valeur

View File

@@ -50,4 +50,8 @@ PERL5_REGEX.NAME=Perl5\u6B63\u898F\u8868\u73FE\u5F0F\u3092\u30D5\u30A1\u30A4\u30
MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306B\u79FB\u52D5
USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
CONFIG_CLIENT.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u8A2D\u5B9A
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
CLIENT_PARAMETERS.ITEM.VALUE=\u5024

View File

@@ -51,3 +51,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u79FB\u81F3\u5F53\u524D\u76EE\u5F55
USE_ENCODING.NAME=\u6587\u4EF6\u540D\u7F16\u7801
CONNECTION_TIMEOUT.NAME=\u8FDE\u63A5\u8D85\u65F6 (\u6BEB\u79D2)
USE_STRICT_REPLY_PARSING.NAME=\u4F7F\u7528\u4E25\u683C\u56DE\u590D\u89E3\u6790
CONFIG_CLIENT.NAME=\u914D\u7F6E\u5BA2\u6237\u7AEF
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=\u5BA2\u6237\u7AEF\u53C2\u6570
CLIENT_PARAMETERS.ITEM.VALUE=\u503C

View File

@@ -4,6 +4,7 @@
org.talend.core.model.process.ElementParameterParser
org.talend.designer.codegen.config.CodeGeneratorArgument
java.util.List
java.util.Map
org.talend.core.model.process.IElementParameter
org.talend.core.model.utils.NodeUtil
"
@@ -47,6 +48,9 @@ boolean useRemoteVerification = ("true").equals(ElementParameterParser.getValue(
boolean useStrictReplyParsing = ("true").equals(ElementParameterParser.getValue(node, "__USE_STRICT_REPLY_PARSING__"));
boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.getProcess(), "__LOG4J_ACTIVATE__"));
boolean isConfigClient = "true".equals(ElementParameterParser.getValue(node, "__CONFIG_CLIENT__"));
List<Map<String, String>> clientParams = (List<Map<String,String>>)ElementParameterParser.getObjectValue(node, "__CLIENT_PARAMETERS__");
if (("true").equals(useExistingConn)) {
List<? extends INode> nodeList = node.getProcess().getGeneratingNodes();

View File

@@ -287,11 +287,31 @@ COMPATIBILITY="ALL"
NUM_ROW="100" SHOW_IF="USE_EXISTING_CONNECTION == 'false'" REPOSITORY_VALUE="USE_STRICT_REPLY_PARSING">
<DEFAULT>true</DEFAULT>
</PARAMETER>
<PARAMETER
NAME="CONFIG_CLIENT"
FIELD="CHECK"
NUM_ROW="110"
SHOW_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"
>
</PARAMETER>
<PARAMETER
NAME="CLIENT_PARAMETERS"
FIELD="TABLE"
NUM_ROW="120"
SHOW_IF="(CONFIG_CLIENT == 'true') AND (SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"
>
<ITEMS>
<ITEM NAME="PARAMETER"></ITEM>
<ITEM NAME="VALUE"></ITEM>
</ITEMS>
</PARAMETER>
</ADVANCED_PARAMETERS>
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="Java-SFTP" MODULE="jsch-0.2.1.jar" MVN="mvn:com.github.mwiede/jsch/0.2.1" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="Java-FTP+S" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20200902.jar"
MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20200902"

View File

@@ -47,3 +47,7 @@ IGNORE_FAILURE_AT_QUIT.NAME=Ignore Failure At Quit (FTP)
USE_ENCODING.NAME=Filename encoding
CONNECTION_TIMEOUT.NAME=Connection timeout (milliseconds)
USE_STRICT_REPLY_PARSING.NAME=Use strict reply parsing
CONFIG_CLIENT.NAME=Config client
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=Client parameter
CLIENT_PARAMETERS.ITEM.VALUE=Value

View File

@@ -47,3 +47,7 @@ IGNORE_FAILURE_AT_QUIT.NAME=Ignorer les erreurs \u00E0 la fermeture (FTP)
USE_ENCODING.NAME=Encodage du nom de fichier
CONNECTION_TIMEOUT.NAME=D\u00E9lai avant l'expiration de la connexion (millisecondes)
USE_STRICT_REPLY_PARSING.NAME=Utiliser le parsage de la r\u00E9ponse stricte
CONFIG_CLIENT.NAME=Config client
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=Param\u00E8tre client
CLIENT_PARAMETERS.ITEM.VALUE=Valeur

View File

@@ -46,4 +46,8 @@ CONNECT_MODE.ITEM.PASSIVE=\u4E0D\u6D3B\u6027
IGNORE_FAILURE_AT_QUIT.NAME=\u7D42\u4E86\u6642\u306B\u30A8\u30E9\u30FC\u3092\u7121\u8996(FTP)
USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
CONFIG_CLIENT.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u8A2D\u5B9A
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
CLIENT_PARAMETERS.ITEM.VALUE=\u5024

View File

@@ -47,3 +47,7 @@ IGNORE_FAILURE_AT_QUIT.NAME=\u9000\u51FA\u65F6\u5FFD\u7565\u5931\u8D25 (FTP)
USE_ENCODING.NAME=\u6587\u4EF6\u540D\u7F16\u7801
CONNECTION_TIMEOUT.NAME=\u8FDE\u63A5\u8D85\u65F6 (\u6BEB\u79D2)
USE_STRICT_REPLY_PARSING.NAME=\u4F7F\u7528\u4E25\u683C\u56DE\u590D\u89E3\u6790
CONFIG_CLIENT.NAME=\u914D\u7F6E\u5BA2\u6237\u7AEF
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=\u5BA2\u6237\u7AEF\u53C2\u6570
CLIENT_PARAMETERS.ITEM.VALUE=\u503C

View File

@@ -45,6 +45,8 @@ String protectionBufferSize = ElementParameterParser.getValue(node, "__FTPS_PROT
String timeoutValue = ElementParameterParser.getValue(node, "__CONNECTION_TIMEOUT__");
boolean useRemoteVerification = ("true").equals(ElementParameterParser.getValue(node, "__REMOTE_VERIFICATION__"));
boolean useStrictReplyParsing = ("true").equals(ElementParameterParser.getValue(node, "__USE_STRICT_REPLY_PARSING__"));
boolean isConfigClient = "true".equals(ElementParameterParser.getValue(node, "__CONFIG_CLIENT__"));
List<Map<String, String>> clientParams = (List<Map<String,String>>)ElementParameterParser.getObjectValue(node, "__CLIENT_PARAMETERS__");
if (("true").equals(useExistingConn)) {
List< ? extends INode> nodeList = node.getProcess().getGeneratingNodes();

View File

@@ -265,11 +265,31 @@
NUM_ROW="100" SHOW_IF="USE_EXISTING_CONNECTION == 'false'" REPOSITORY_VALUE="USE_STRICT_REPLY_PARSING">
<DEFAULT>true</DEFAULT>
</PARAMETER>
<PARAMETER
NAME="CONFIG_CLIENT"
FIELD="CHECK"
NUM_ROW="110"
SHOW_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"
>
</PARAMETER>
<PARAMETER
NAME="CLIENT_PARAMETERS"
FIELD="TABLE"
NUM_ROW="120"
SHOW_IF="(CONFIG_CLIENT == 'true') AND (SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"
>
<ITEMS>
<ITEM NAME="PARAMETER"></ITEM>
<ITEM NAME="VALUE"></ITEM>
</ITEMS>
</PARAMETER>
</ADVANCED_PARAMETERS>
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="Java-SFTP" MODULE="jsch-0.2.1.jar" MVN="mvn:com.github.mwiede/jsch/0.2.1" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="Java-FTP+S" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20200902.jar"
MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20200902"

View File

@@ -48,3 +48,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=Move to the current directory
USE_ENCODING.NAME=Filename encoding
CONNECTION_TIMEOUT.NAME=Connection timeout (milliseconds)
USE_STRICT_REPLY_PARSING.NAME=Use strict reply parsing
CONFIG_CLIENT.NAME=Config client
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=Client parameter
CLIENT_PARAMETERS.ITEM.VALUE=Value

View File

@@ -48,3 +48,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=D\u00E9placer vers le r\u00E9pertoire courant
USE_ENCODING.NAME=Encodage du nom de fichier
CONNECTION_TIMEOUT.NAME=D\u00E9lai avant l'expiration de la connexion (millisecondes)
USE_STRICT_REPLY_PARSING.NAME=Utiliser le parsage de la r\u00E9ponse stricte
CONFIG_CLIENT.NAME=Config client
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=Param\u00E8tre client
CLIENT_PARAMETERS.ITEM.VALUE=Valeur

View File

@@ -47,4 +47,8 @@ FILES.ITEM.FILEMASK=\u30D5\u30A1\u30A4\u30EB\u30DE\u30B9\u30AF
MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306B\u79FB\u52D5
USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
CONFIG_CLIENT.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u8A2D\u5B9A
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
CLIENT_PARAMETERS.ITEM.VALUE=\u5024

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