Compare commits

...

296 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
wang wei
72c11045a9 fix(TDI-47966): [JDBC TCK]: We have a input/mapper which is defined by Emitter, that don't works for using existed connection(#7511) (#7561) 2022-05-23 14:23:24 +08:00
wang wei
cc84dfffb6 fix(TDI-47958): [JDBC TCK]: support the component like tjdbcrow which have 3 modes in studio(#7501) (#7562) 2022-05-23 14:23:16 +08:00
hzhao-talendbj
249f91b6de fix(TUP-28879): JDBC metadata`s modification cannot be porpagated to (#7508) (#7555)
components
2022-05-21 13:55:22 +08:00
Chao MENG
8c1a8995d9 fix(TUP-35616): Problems on the \ processing on the password field after TUP-32821 (#7551)
* fix(TUP-35616): Problems on the \ processing on the password field after
TUP-32821
https://jira.talendforge.org/browse/TUP-35616

* Update PasswordDialog.java

* fix(TUP-35616): Problems on the \ processing on the password field after
TUP-32821
https://jira.talendforge.org/browse/TUP-35616
2022-05-19 19:25:07 +08:00
tsasada-talend
7398af81c7 Add localized files (#7550)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-05-19 17:42:57 +08:00
Alexiane Yvonet
6a546b134a Add localized files (#7549)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-05-19 17:41:32 +08:00
Dmytro Ochkas
49b47b16a8 fix(TDI-47932): EncryptClientSecretMicrosoftCRMMigrationTask returns wrong value (#7491)
Added modification check
2022-05-19 11:08:20 +03:00
Dmytro Ochkas
9cc26cd33a fix(TDI-47879): tExtractJSONFields NB_LINE not updated
Removed destination property from tExtractJSONFields. Created migration to remove the property from .item file
2022-05-19 10:39:22 +03:00
Jane Ding
e418bd6510 fix(TUP-33119):SuggestionValues.Item label is received at runtime (#7546)
* Revert "fix(TUP-33119):SuggestionValues.Item label is received at runtime (#7320)" (#7533)

This reverts commit b521f4208a.

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

instead of id when used inside table
https://jira.talendforge.org/browse/TUP-33119
2022-05-19 09:50:23 +08:00
pyzhou
2734f706d5 feat(TDI-47152):tFileFetch upgrade v4 (#7403)
* feat(TDI-47152):tFileFetch upgrade v4

* feat(TDI-47687):promote jar imports

* feat(TDI-47687):adjust show if

* fix(TDI-47152):  compile error

* fix(TDI-47152):  read cookie

* bad content type

* error message

* compile error
2022-05-18 14:41:45 +08:00
bhe-talendbj
4c96ffc367 fix(TUP-35590): update slf4j (#7540) 2022-05-17 18:04:24 +08:00
Oleksandr Zhelezniak
66fbcde8d2 fix(TDI-46054): support java11 mscrm onprem 2015 (#7490)
* add jaxb-api-2.3.1
* add jaxws-api-2.3.1
* add javax.annotation-api-1.3.2
* align slf4j dependencies to 1.7.29
2022-05-17 10:42:33 +03:00
Chao MENG
be625ab3ee chore: update message (#7528) 2022-05-13 18:08:06 +08:00
jzhangbj
e4958bb494 Add localized files (#7525)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-05-12 20:40:35 +08:00
tsasada-talend
487dcf08d6 Add localized files (#7524)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-05-12 20:40:15 +08:00
Chao MENG
0e3b5eb9d9 Cmeng/feat/tup 33928 tmc update (#7463)
* feat(TUP-33928): Controlled Studio Updates from TMC
https://jira.talendforge.org/browse/TUP-33928
2022-05-12 18:57:29 +08:00
Chao MENG
123ce87273 feat(TUP-32821): Credential property value in json format in tck framework (#7451)
* feat(TUP-32821): Credential property value in json format in tck
framework
https://jira.talendforge.org/browse/TUP-32821

* feat(TUP-32821): Credential property value in json format in tck
framework
https://jira.talendforge.org/browse/TUP-32821

* fix(TUP-35529): MarkLogic password display not properly
https://jira.talendforge.org/browse/TUP-35529
2022-05-12 18:38:09 +08:00
Chao MENG
b32f6ec697 fix(TUP-35400): Save snowflake metadata failed when selected table name (#7509)
start with number
https://jira.talendforge.org/browse/TUP-35400
2022-05-12 18:27:16 +08:00
hcyi
35171da7d9 feat(TUP-34889):Support to prompt Context on Metadata Connection (#7473)
* feat(TUP-34889):Support to prompt Context on Metadata Connection

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

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

* feat(TUP-34889):fix bug TUP-35370 and TUP-35372

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

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

* feat(TUP-34889):fix bug TUP-35503 and TUP-35504
2022-05-12 17:12:39 +08:00
hcyi
04efc3ada0 Hcyi/tup 32889 master (#7306)
* fix(TUP-32889):Credential value with double quotes in tck framework

* fix(TUP-32889):add junits

* fix(TUP-32889):Credential value with double quotes in tck framework
2022-05-12 15:18:55 +08:00
Jane Ding
bb67871008 fix(TUP-33119):SuggestionValues.Item label is received at runtime (#7320) (#7523)
* fix(TUP-33119):SuggestionValues.Item label is received at runtime
instead of id when used inside table
https://jira.talendforge.org/browse/TUP-33119

* fix(TUP-33119):SuggestionValues.Item label is received at runtime
instead of id when used inside table
https://jira.talendforge.org/browse/TUP-33119

* fix(TUP-33119):SuggestionValues.Item label is received at runtime
instead of id when used inside table
https://jira.talendforge.org/browse/TUP-33119

* fix(TUP-33119):SuggestionValues.Item label is received at runtime
instead of id when used inside table
https://jira.talendforge.org/browse/TUP-33119

* fix(TUP-33119):SuggestionValues.Item label is received at runtime
instead of id when used inside table
https://jira.talendforge.org/browse/TUP-33119

* fix(TUP-33119):SuggestionValues.Item label is received at runtime
instead of id when used inside table
https://jira.talendforge.org/browse/TUP-33119
2022-05-12 09:41:06 +08:00
Wei Hua
6af9c4ee98 APPINT-34569 [801]Job including tRESTand tRESTClient deployed to runtime with error: com.sun.jersey.api.client.ClientHandlerException (#7515) 2022-05-11 14:47:56 +02:00
apoltavtsev
13e096e752 fix(APPINT-34578) MDM components causing 'java.lang.ClassNotFoundException' (#7520) 2022-05-11 11:56:58 +02:00
hcyi
47268fad44 feat(TUP-28953):move change to other util class . (#7512) 2022-05-11 11:31:27 +08:00
Oleksandr Zhelezniak
8115399b97 chore(TDI-47688): bump jackson (#7383)
* jackson to 2.13.2
* jackson-databind to  2.13.2.2
2022-05-09 14:55:52 +03:00
Oleksandr Zhelezniak
721b3de01e chore(TDI-47688): bump jackson (#7386) 2022-05-09 14:38:58 +03:00
Olha V
f6ab592562 fix(TDI-47519): Kafka ssl conflict with schema registry (#7325)
* fix(TDI-47519): Kafka ssl conflict with schema registry

* add migration task

* fix(TDI-47519): Kafka ssl conflict with schema registry

* fix schema registry ssl configuration for empty kafka tSetKeystore

* fix(TDI-47519): Kafka ssl conflict with schema registry

* add null check for schema registry use ssl property

* fix(TDI-47519): Kafka ssl conflict with schema registry

* fix migration for empty tSetKeystore in existing connection

* fix(TDI-47519): Kafka ssl conflict with schema registry

* add null check for https settings
* clean up code

* fix(TDI-47519): Kafka ssl conflict with schema registry

* fix migrated status
2022-05-09 13:18:00 +03:00
Jane Ding
2751229fbe fix(TUP-35252):Additional parameter can not update to the job after (#7445) (#7503)
* fix(TUP-35252):Additional parameter can not update to the job after
modified.
https://jira.talendforge.org/browse/TUP-35252

* fix(TUP-35252):Additional parameter can not update to the job after
modified.
https://jira.talendforge.org/browse/TUP-35252
2022-05-07 10:48:49 +08:00
Dmytro Grygorenko
e8f5139248 feat(TDI-45870): checkbox in tWriteJSONField to avoid use of scientific notation for float values. (#7183)
* feat(TDI-45870): checkbox in tWriteJSONField to avoid use of Scientific notation for float values.

* feat(TDI-45870): change default action for checkbox.

* feat(TDI-45870): migration task.
2022-05-06 15:21:52 +03:00
hcyi
a5c0992356 fix(TUP-35248):Context password exposed when hovering over context on (#7500)
Talend 8
2022-05-06 15:56:32 +08:00
tsasada-talend
708091be96 Add localized files (#7496)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-05-05 16:33:15 +08:00
Alexiane Yvonet
4a43182f39 Add localized files (#7493)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-05-05 16:27:16 +08:00
hcyi
3a31923c97 feat(TUP-28953):Spark Big Data/streaming job are missing "open another version" action. (#7421)
* feat(TUP-28953):Spark Big Data/streaming job are missing "open another
version" action.

* feat(TUP-28953):add junits
2022-05-05 14:03:14 +08:00
wang wei
cd69df6ca7 fix(TDI-47819): tJDBCInput component results in error with Dynamic schema inTalend latest versions. (#7426) (#7492) 2022-05-05 13:42:07 +08:00
Dmytro Grygorenko
ef25314bba feat(TDI-45629): add dynamic schema support for tFileOutputJSON. (#7147)
* feat(TDI-45629): add dynamic schema support for tFileOutputJSON.

* feat(TDI-45629): changes after code review.

* feat(TDI-45629): some more changes.
2022-04-29 17:13:36 +03:00
jzhangbj
d1214eddb3 Add localized files (#7482)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-28 18:05:23 +08:00
tsasada-talend
829ba7a572 Add localized files (#7481)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-28 18:04:57 +08:00
pyzhou
d9f1c04b07 feat(TDI-43829): Add support for zip4j 2.x libraries to tFileArchive/… (#7423)
* feat(TDI-43829): Add support for zip4j 2.x libraries to tFileArchive/unArchive components

* fix(TDI-43829): move IntegrityUtil.java
2022-04-28 16:44:17 +08:00
Alexiane Yvonet
b62353969a Add localized files (#7476)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-28 15:38:06 +08:00
hcyi
c4a60de7dd fix(TUP-35078):tJDBCSCDELT does not work correctly on Snowflake. (#7395)
* fix(TUP-35078):tJDBCSCDELT does not work correctly on Snowflake.

* fix(TUP-35078):add junits
2022-04-25 17:19:15 +08:00
yyin
b8bd877a97 Feat TDQ-20141 add param algoVersion (#7430) 2022-04-22 14:38:56 +08:00
jzhangbj
32cbc40ffc Add localized files (#7467)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-22 09:53:29 +08:00
Alexiane Yvonet
9b530b68b3 Add localized files (#7466)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-22 09:50:22 +08:00
Tetiana Meronyk
f8790d0597 fix(TDI-47257): tELTOracleOutput does not print messages during execution unlike other tELT***Output components (#7387) 2022-04-22 01:48:21 +03:00
sponomarova
843cccff2d fix(TBD-13798): CVE: Replace log4j1.x by reload4j for org.talend.libraries.hadoop.mapr.5.0.0 (#7449) (#7462) 2022-04-21 15:26:11 +03:00
AlixMetivier
249d40f4be fix(TBD-13517): set default value as 3.1 for univ (#7465) (#7468) 2022-04-21 14:22:06 +02:00
vyu-talend
93a5a1842d fix(TDI-46584):modify limit label. (#7460) 2022-04-20 18:10:50 +08:00
hzhao-talendbj
4465b7539e remove @test to fix tuj build failed (#7456) 2022-04-20 17:49:21 +08:00
Jane Ding
05fe5ebd78 fix(TUP-35238):Drag and drop Redshift metadata to list components lost (#7442)
some components
https://jira.talendforge.org/browse/TUP-35238
2022-04-19 17:42:34 +08:00
Chao MENG
35ba1c7dec chore: fix swtbot issue (#7446) 2022-04-19 11:12:59 +08:00
Dmytro Sylaiev
cd025ab26c fix(TDI-47802): Fix short strings as Clobs (#7425)
* Add warning for long strings as varchar
2022-04-18 15:31:59 +03:00
bhe-talendbj
96823a247b fix(TUP-35191): fix java path (#7394) (#7427)
* fix(TUP-35191): fix java path

* fix(TUP-35191): fix java path

* fix(TUP-35191): fix java path

* fix(TUP-35191): fix java path

* fix(TUP-35191): add junit

* fix(TUP-35191): add junit

* fix(TUP-35191): add junit

* fix(TUP-35191): add junit

* fix(TUP-35191): update junit package

* fix(TUP-35191): find java instead of guess

* fix(TUP-35191): find java instead of guess
2022-04-18 14:19:13 +08:00
Laurent BOURGEOIS
d4ef464d10 feat(TBD-13522):CDE - GA (#7358) (#7440) 2022-04-15 21:57:03 +03:00
Dmytro Ochkas
5629a19ec1 fix(TDI-47539): MSCRM Application secret as password (#7432)
Update migration task
2022-04-15 12:14:48 +03:00
Jane Ding
5bc4f7e536 feat(TUP-35069):Upgrade Redshift driver to v2.x (#7436)
* feat(TUP-35069):Upgrade Redshift driver to v2.x (#7433)

https://jira.talendforge.org/browse/TUP-35069

* feat(TUP-35069):Upgrade Redshift driver to v2.x (#7411)

https://jira.talendforge.org/browse/TUP-35069
2022-04-15 15:49:37 +08:00
Jane Ding
de34ef2e0f fix(TUP-35238):Drag and drop Redshift metadata to list components lost (#7419) (#7435)
* fix(TUP-35238):Drag and drop Redshift metadata to list components lost
some components
https://jira.talendforge.org/browse/TUP-35238

* fix(TUP-35238):Drag and drop Redshift metadata to list components lost
some components
https://jira.talendforge.org/browse/TUP-35238
2022-04-15 15:47:04 +08:00
pyzhou
513a0026e9 feat(TDI-47263):upgrade redshift driver 2.0 (#7356) 2022-04-14 17:54:30 +08:00
jzhangbj
42e24269e7 Add localized files (#7431)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-14 16:30:05 +08:00
tsasada-talend
7da74ee9ce Add localized files (#7429)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-14 16:08:14 +08:00
Jane Ding
92a8bae40d fix(TUP-34716):can't get the right (#7346)
* fix(TUP-34716):can't get the right
"ACTIVE_DATABASE_DELIMITED_IDENTIFIERS" property value in tELTMap in
javajet
https://jira.talendforge.org/browse/TUP-34716

* fix(TUP-34716):can't get the right
"ACTIVE_DATABASE_DELIMITED_IDENTIFIERS" property value in tELTMap in
javajet
https://jira.talendforge.org/browse/TUP-34716
2022-04-13 00:48:09 +08:00
wang wei
8dc29d227c fix(TDI-47496): Column names in a main query are not enclosed when enabling "Delimited identifiers" (#7198) 2022-04-12 18:11:32 +08:00
vyu-talend
fc3ccf48fd feat(TDI-46111):upgrade teradata jdbc driver to 17. (#7376) (#7420) 2022-04-12 14:50:10 +08:00
pyzhou
065859a00a feat(TDI-47687):tScp reuse session (#7408)
* feat(TDI-47687):tScp reuse session

* feat(TDI-47687): tSCPFileList

* feat(TDI-47687): tSCPFileList compile error
2022-04-12 11:44:45 +08:00
hcyi
2c20ddcf20 feat(TUP-34849):missing a change for the d&d (#7415) 2022-04-12 09:39:46 +08:00
vyu-talend
8cef3416ca fix(TDI-46584): tServiceNowInput Limit disable option in Advanced settings not working (#6717) (#7413)
* fix(TDI-46584): tServiceNowInput Limit disable option in Advanced
settings not working

* fix something

* fix more

* fix(TDI-46584):fix the job won't stop issue.

* fix(TDI-46584):fix always reading-all-records issue.

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

Co-authored-by: wang wei <wwang@talend.com>
2022-04-11 17:33:46 +08:00
Tetiana Meronyk
36cda8c80f fix(TDI-47133): the log "closing the connection" in tCreateTable is not right (#7360) 2022-04-10 15:41:56 +03:00
Dmytro Ochkas
fee8c502a6 chore(TDI-47539): moved EncryptClientSecretMicrosoftCRMMigrationTask.java to correct directory (#7409) 2022-04-08 15:46:40 +03:00
jzhangbj
36d4eaa32b Add localized files (#7405)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-08 09:41:59 +08:00
tsasada-talend
aff0f14066 Add localized files (#7398)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-07 17:32:33 +08:00
Chao MENG
223b173995 fix(TUP-35034): CI - stop the build if custom component is missing (#7400)
https://jira.talendforge.org/browse/TUP-35034
2022-04-07 16:34:44 +08:00
Alexiane Yvonet
57c80b2474 Add localized files (#7396)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-07 15:51:38 +08:00
Dmytro Ochkas
0098757eea fix(TDI-47539): tMicrosoftCRM change application secret as a password (#7324)
Changed field type and refactored code so that 2 passwords didn't conflict. Created Migration task to encrypt client secret field
2022-04-06 15:46:40 +03:00
vyu-talend
abe8279842 chore(TDI-47404):bump cxf version to 3.4.4 (#7313) (#7391)
* chore(TDI-47404):bump cxf version to 3.4.4

* fix(TDI-47404):delete the codes causing error.

* chore(TDI-47404):bump cxf in talend ws.
2022-04-06 16:07:20 +08:00
sbliu
75eef3b4f4 fix(TUP-27413) add junit (#7378) 2022-04-06 09:44:07 +08:00
clesaec
572d3f7442 TDI-47287 : change ftpput (#7389) 2022-04-04 16:36:20 +02:00
Dmytro Grygorenko
07b105e021 fix(TDI-47725): increment nb_line counter for "on duplicate" output action. (#7351) 2022-04-04 16:34:54 +03:00
Chao MENG
f1252fb198 fix(TUP-35034): CI - stop the build if custom component is missing (#7381)
https://jira.talendforge.org/browse/TUP-35034
2022-04-01 19:14:41 +08:00
wang wei
7022e89faa fix(TDI-47536): CVE : logback (#7226) 2022-04-01 15:42:36 +08:00
jzhangbj
6be7f102dd Add localized files (#7368)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-01 15:42:01 +08:00
tsasada-talend
59bd368ae4 Add localized files (#7364)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-01 15:41:27 +08:00
Alexiane Yvonet
a9b8d1e085 Add localized files (#7363)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-01 15:40:15 +08:00
jiezhang-tlnd
2ea31df991 fix(TUP-34954)CVE: Replace log4j1.x by reload4j (#7329) (#7369)
* fix(TUP-34954)CVE: Replace log4j1.x by reload4j

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

* update junits

* exclude log4j from slf4j-log4j12
2022-04-01 15:37:16 +08:00
wang wei
e44378bd76 fix(TDI-47633): CVE: Replace log4j1.x by reload4j or upgrade to log4j2 (#7370) 2022-04-01 15:18:06 +08:00
sbliu
419adb67e9 fix(TUP-27413) SQL Builder: Graphical Editor is Empty for a specific table. (#7336) 2022-04-01 09:41:01 +08:00
Xilai Dai
6ec03713a3 fix(APPINT-34443) add missing import packages for tRESTClient (#7362) 2022-03-31 14:27:15 +08:00
Chao MENG
2d9904378b Cmeng/fix/tup 35034 err on component missing (#7326)
* fix(TUP-35034): CI - stop the build if custom component is missing
https://jira.talendforge.org/browse/TUP-35034

* fix(TUP-35034): CI - stop the build if custom component is missing
https://jira.talendforge.org/browse/TUP-35034

* fix(TUP-35034): CI - stop the build if custom component is missing
https://jira.talendforge.org/browse/TUP-35034

* fix(TUP-35034): CI - stop the build if custom component is missing
https://jira.talendforge.org/browse/TUP-35034
2022-03-30 16:09:19 +08:00
Dmytro Grygorenko
e541c3a75d fix(TDI-47670): fix Xpath "count" function for unformatted XML file. (#7333)
* fix(TDI-47670): use asXML() method instead of getText().

* fix(TDI-47670): use getStringValue() method instead.

* fix(TDI-47670): use isEmpty() method.
2022-03-29 16:13:28 +03:00
Dmytro Grygorenko
feaf9e516b fix(TDI-47532): bump XercesImpl library to 2.12.2 (#7321) 2022-03-28 16:21:59 +03:00
Dmytro Ochkas
3aa3e21582 fix(TDI-47560): tSybaseOutput BigDecimal jdbc inconsistencies (#7305)
Set BigDecimal for each Sybase version. Add DBVersion field to Manager class and remove it from OracleManager
2022-03-28 11:57:37 +03:00
wang wei
a640f1a0e3 fix(TDI-47154): no need to generate label code for joblet case if not change label(#7345) 2022-03-28 15:10:09 +08:00
wang wei
36f228c840 fix(TDI-47589): "Write Excel 2007 format" leads to tFileOutputExcel poor performance(#7261) 2022-03-28 14:26:30 +08:00
Oleksandr Zhelezniak
2b40550ff4 fix(TDI-47651): bump Redshift driver to 1.2.55.1083 (#7341) 2022-03-25 11:46:53 +02:00
jzhangbj
96a75df148 Add localized files (#7343)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-25 15:38:52 +08:00
Alexiane Yvonet
ed960cbf8a Add localized files (#7338)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-24 17:10:35 +08:00
tsasada-talend
83fa4543c4 Add localized files (#7337)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-24 17:08:36 +08:00
jiezhang-tlnd
80da90a14f chore(TUP-34977)Help links in Studio (#7317) 2022-03-21 15:22:59 +08:00
pyzhou
4adc7f0354 fix(TDI-47223):CVE_axis2-kernel compile error (#7309)
* fix(TDI-47223):CVE_axis2-kernel compile error

* correct mvn path
2022-03-18 17:34:04 +08:00
Dmytro Grygorenko
57e9574e9d fix(TDI-47073): fix description for tBigQueryOutput. (#7314) 2022-03-18 10:07:37 +02:00
tsasada-talend
c30c1109e4 Add localized files (#7318)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-18 10:34:38 +08:00
Alexiane Yvonet
79472b4e32 Add localized files (#7319)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-18 10:32:12 +08:00
jzhao
2dfae00169 fix(TDI-47373):update IBM MQ client lib to 9.2.4.0 (#7281) (#7311) 2022-03-16 16:31:23 +08:00
Chao MENG
f4f1bf3fb6 fix(TUP-34378): Job could build out successfully if contains component which cannot be loaded (#7286)
* fix(TUP-34378): Job could build out successfully if contains component
which cannot be loaded
https://jira.talendforge.org/browse/TUP-34378
2022-03-16 16:19:36 +08:00
Emmanuel GALLOIS
8f5d517779 fix(TCOMP-2003): Maven dependency classifier considered as version in dependencies.txt by Studio (#7302)
* fix(TCOMP-2003): fix Mvn.toLocation in GAV parsing
2022-03-11 16:36:52 +01:00
hzhao-talendbj
5c9a80937a chore(TUP-34757): Add a getOriginalName() in IConnection (#7301)
* chore(TUP-34757): Add a getOriginalName() in IConnection

* chore(TUP-34757): Add a getOriginalName() in IConnection
2022-03-11 17:35:38 +08:00
pyzhou
2f3f5ee9b2 fix(TDI-47528):CVE mina-sshd (#7299)
upgrade talend-scp-helper version

compile error

compile error

compile error

compile error
2022-03-11 11:29:09 +08:00
wang wei
4f362f4423 fix(TDI-47154): send exception info for audit log (#6952) 2022-03-11 11:25:24 +08:00
chmyga
057c9d9276 feat(TDI-46441): add cassandra 4.0 support (#6703)
Co-authored-by: Dmytro Chmyga <dmytro.chmyga@globallogic.com>
Co-authored-by: Dmytro Sylaiev <dmytro.sylaiev@globallogic.com>
2022-03-10 18:45:48 +08:00
tsasada-talend
bb14c4fdaf Add localized files (#7298)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-10 18:36:25 +08:00
Alexiane Yvonet
29638dc7aa Add localized files (#7297)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-10 17:55:52 +08:00
Dmytro Sylaiev
72830bf1f7 fix(TDI-47452): Fix codegen for not valid xpath expression (#7175) 2022-03-10 11:49:39 +02:00
bhe-talendbj
5a28729481 feat(TUP-33809): check modulelist (#7209) (#7294)
* feat(TUP-33809): check modulelist

* feat(TUP-33809): get all sub jobs
2022-03-10 17:28:27 +08:00
Jane Ding
67508cca0d fix(TUP-28898):Drag Exasol connection to a job choose tDBOutput(Exasol) (#7260) (#7296)
* fix(TUP-28898):Drag Exasol connection to a job choose tDBOutput(Exasol)
not work as tExasolOutput
https://jira.talendforge.org/browse/TUP-28898

* fix(TUP-28898):Drag Exasol connection to a job choose tDBOutput(Exasol)
not work as tExasolOutput
https://jira.talendforge.org/browse/TUP-28898
2022-03-09 17:49:54 +08:00
Jane Ding
6d75380549 feat(TUP-33990):Pendo tracking for Studio integrations with API Designer (#7227) (#7295)
& API Tester
https://jira.talendforge.org/browse/TUP-33990
2022-03-09 17:48:49 +08:00
920 changed files with 15161 additions and 5344 deletions

File diff suppressed because one or more lines are too long

View File

@@ -43,11 +43,13 @@
<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"/>
<plugin id="org.talend.repository.metadata.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.repository.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.sqlbuilder.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.repository.view.di.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.repository.view.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.testutils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>

View File

@@ -137,7 +137,7 @@
}
%>
currentComponent="<%=node.getUniqueName() %>";
<%
connSet = new HashSet<IConnection>();
connSet.addAll(node.getIncomingConnections(EConnectionType.FLOW_MAIN));
@@ -155,6 +155,17 @@
//about performance monitor, no way to support more than one job catcher component, also that is not necessary
final String subprocessName4Catcher = logstashCurrent ? jobCatcherNodes.get(0).getDesignSubjobStartNode().getUniqueName() : null;
if(logstashCurrent) {
String currentLabel = ElementParameterParser.getValue(node, "__LABEL__");
if(currentLabel==null || "".equals(currentLabel) || "__UNIQUE_NAME__".equals(currentLabel) || cid.endsWith(NodeUtil.getLabel(node))) {
//not generate the unnecessary statement if label is default one
} else {
%>
cLabel="<%=NodeUtil.getLabel(node)%>";
<%
}
}
if ((codePart.equals(ECodePart.BEGIN))&&(stat || logstashCurrent)&&connSet.size()>0) {
if(containsTPartitioner) {
%>

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");
@@ -223,7 +224,7 @@
public boolean useDatastax(INode node){
String dbVersion = ElementParameterParser.getValue(node, "__DB_VERSION__");
String apiType = ElementParameterParser.getValue(node, "__API_TYPE__");
return "CASSANDRA_2_2".equals(dbVersion) || "CASSANDRA_3_0".equals(dbVersion) || ("CASSANDRA_2_0_0".equals(dbVersion) && "DATASTAX".equals(apiType));
return "CASSANDRA_2_2".equals(dbVersion) || "CASSANDRA_3_0".equals(dbVersion) || "CASSANDRA_4_0".equals(dbVersion) || ("CASSANDRA_2_0_0".equals(dbVersion) && "DATASTAX".equals(apiType));
}
}
%>
@@ -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;
@@ -1407,16 +1504,27 @@ if (execStat) {
Object obj_cluster;
Object obj_conn;
<% for (INode cassandraDbNode : cassandraComponentsList) {
if((new API_selector()).useDatastax(cassandraDbNode)) { %>
obj_cluster = globalMap.remove("cluster_<%=cassandraDbNode.getUniqueName()%>");
obj_conn = globalMap.remove("connection_<%=cassandraDbNode.getUniqueName()%>");
if(obj_conn != null) {
((com.datastax.driver.core.Session) obj_conn).close();
}
if(obj_cluster != null) {
((com.datastax.driver.core.Cluster) obj_cluster).close();
}
<% } else { %>
String dbVersionCassandra = ElementParameterParser.getValue(cassandraDbNode, "__DB_VERSION__");
if((new API_selector()).useDatastax(cassandraDbNode)) {
if("CASSANDRA_4_0".equals(dbVersionCassandra)) {
%>
obj_conn = globalMap.remove("connection_<%=cassandraDbNode.getUniqueName()%>");if(obj_conn != null) {
((com.datastax.oss.driver.api.core.CqlSession) obj_conn).close();
}
<%
} else {
%>
obj_cluster = globalMap.remove("cluster_<%=cassandraDbNode.getUniqueName()%>");
obj_conn = globalMap.remove("connection_<%=cassandraDbNode.getUniqueName()%>");
if(obj_conn != null) {
((com.datastax.driver.core.Session) obj_conn).close();
}
if(obj_cluster != null) {
((com.datastax.driver.core.Cluster) obj_cluster).close();
}
<%
}
} else { %>
obj_conn = globalMap.remove("cluster_<%=cassandraDbNode.getUniqueName()%>");
if(obj_conn!=null) {
((me.prettyprint.hector.api.Cluster) obj_conn).getConnectionManager().shutdown();

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

@@ -170,16 +170,8 @@ class IndexedRecordToRowStructGenerator {
if (columnName.equals(dynamicColName)) {
%>
java.util.Map<String, Object> dynamicValue_<%=cid%> = (java.util.Map<String, Object>) <%=codeVarSchemaEnforcer%>.get(<%=i%>);
org.apache.avro.Schema dynSchema_<%=cid%> = ((org.talend.codegen.enforcer.OutgoingDynamicSchemaEnforcer) <%=codeVarSchemaEnforcer%>).getDynamicFieldsSchema();
for (org.apache.avro.Schema.Field dynamicField_<%=cid%> : dynSchema_<%=cid%>.getFields()){
String name = dynamicField_<%=cid%>.name();
if("true".equals(dynamicField_<%=cid%>.getProp("ENABLE_SPECIAL_TABLENAME"))){
dynamicValue_<%=cid%>.put(dynamicField_<%=cid%>.getProp("talend.field.dbColumnName"), dynamicValue_<%=cid%>.get(name));
dynamicValue_<%=cid%>.remove(name);
}
}
for (java.util.Map.Entry<String, Object> dynamicValueEntry_<%=cid%> : dynamicValue_<%=cid%>.entrySet()) {
<%=codeVarDynamic%>.setColumnValue(<%=codeVarDynamic%>.getIndex(dynamicValueEntry_<%=cid%>.getKey()), dynamicValueEntry_<%=cid%>.getValue());
<%=codeVarDynamic%>.addColumnValue(dynamicValueEntry_<%=cid%>.getValue());
}
<%=codeVarRowStruct%>.<%=dynamicColName%> = <%=codeVarDynamic%>;
<%

View File

@@ -343,6 +343,10 @@ public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Ch
public Integer errorCode = null;
private String currentComponent = "";
<%
// is necessary? avoid some compiler issue as var name not found? TODO consider remove it, also the currentComponent above
%>
private String cLabel = null;
<%
//tParallelize will wrap globalMap with synchronizedMap
if(isRunInMultiThread || NodeUtil.containsMultiThreadComponent(process)){
%>
@@ -597,7 +601,10 @@ private class TalendException extends Exception {
private java.util.Map<String, Object> globalMap = null;
private Exception e = null;
private String currentComponent = null;
private String cLabel = null;
private String virtualComponentName = null;
public void setVirtualComponentName (String virtualComponentName){
@@ -609,6 +616,11 @@ private class TalendException extends Exception {
this.globalMap = globalMap;
this.e = e;
}
private TalendException(Exception e, String errorComponent, String errorComponentLabel, final java.util.Map<String, Object> globalMap) {
this(e, errorComponent, globalMap);
this.cLabel = errorComponentLabel;
}
public Exception getException() {
return this.e;
@@ -668,6 +680,15 @@ private class TalendException extends Exception {
<%
boolean needCatchTalendException = false;
if(enableLogStash) {
%>
if(enableLogStash) {
<%=jobCatcherNode.getUniqueName() %>.addJobExceptionMessage(currentComponent, cLabel, null, e);
<%=jobCatcherNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
}
<%
}
if (process.getNodesOfType("tLogCatcher").size() > 0) {
List<INode> logCatchers = (List<INode>)process.getNodesOfType("tLogCatcher");
for (INode logCatcher : logCatchers) {
@@ -678,7 +699,7 @@ private class TalendException extends Exception {
<%
}
}
INode virtualNCatchNode = null;
boolean hasRealCatchNode = false;
for (INode logCatcher : logCatchers) {

View File

@@ -71,7 +71,7 @@
}
}
TalendException te = new TalendException(e, currentComponent, globalMap);
TalendException te = new TalendException(e, currentComponent, cLabel, globalMap);
<%
if(NodeUtil.hasVirtualComponent(subTree.getNodes())){
%>

View File

@@ -200,6 +200,7 @@ for (IConnection iterateConn : iterateConnSet) { //1
this.isRunning = true;
String currentComponent = "";
String cLabel = null;
java.util.Map<String, Object> resourceMap = new java.util.HashMap<String, Object>();
<%
if(NodeUtil.hasVirtualComponent(subTree.getNodes())){

View File

@@ -67,7 +67,7 @@
this.errorCode = localErrorCode;
}
}
pool.setErrorThread(this, new TalendException(e, currentComponent, globalMap));
pool.setErrorThread(this, new TalendException(e, currentComponent, cLabel, globalMap));
//pool.setErrorThread(this,e);
pool.stopAllThreads();
}finally{
@@ -117,7 +117,7 @@
} catch (InterruptedException e) {
e.printStackTrace();
} catch (java.lang.Exception te) {
throw new TalendException(te, currentComponent, globalMap);
throw new TalendException(te, currentComponent, cLabel, globalMap);
}
<%
}else{
@@ -228,7 +228,7 @@
<%
}
%>
TalendException te = new TalendException(e, currentComponent, globalMap);
TalendException te = new TalendException(e, currentComponent, cLabel, globalMap);
<%
if(NodeUtil.hasVirtualComponent(subTree.getNodes())){
%>

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()) {
@@ -1641,6 +1648,7 @@ public void <%=subTree.getName() %>Process(final java.util.Map<String, Object> g
this.isRunning = true;
String currentComponent = "";
String cLabel = null;
<%
if(NodeUtil.hasVirtualComponent(subTree.getNodes())){
%>
@@ -1674,6 +1682,7 @@ public void <%=subTree.getName() %>Process(final java.util.Map<String, Object> g
int iterateLoop = 0;
<%}%>
String currentComponent = "";
String cLabel = null;
java.util.Map<String, Object> resourceMap = new java.util.HashMap<String, Object>();
try {

View File

@@ -10,6 +10,7 @@ CodeGenerator.getGraphicalNode2=------process.getGeneratingNodes()------
CodeGenerator.JET.TimeOut=JET initialisation Time Out
CodeGenerator.newLine=\n\n\n\n
CodeGenerator.Node.NotFound=Node not found in current process
CodeGenerator.Components.NotFound={0}: Component is missing: {1}; use -D{2}=false in your studio or commandline to skip this check, and a warning message will be logged.
JavaRoutineSynchronizer.UnsupportedOperation.Exception1=method not implemented: org.talend.designer.codegen.JavaRoutineSynchronizer line:49
JavaRoutineSynchronizer.UnsupportedOperation.Exception2=method not implemented: org.talend.designer.codegen.JavaRoutineSynchronizer line:58
JetSkeletonManager.unableLoad=unable to load skeleton update cache file

View File

@@ -10,6 +10,7 @@ CodeGenerator.getGraphicalNode2=------process.getGeneratingNodes()------
CodeGenerator.JET.TimeOut=D\u00E9lai d'initialisation JET d\u00E9pass\u00E9
CodeGenerator.newLine=\n\n\n\n
CodeGenerator.Node.NotFound=N\u0153ud introuvable dans le processus courant
CodeGenerator.Components.NotFound={0}\u00A0: Le composant est manquant\u00A0: {1}; utilisez -D{2}=false dans votre Studio ou CommandLine pour ignorer cette v\u00E9rification. Un message d'avertissement sera enregistr\u00E9 dans les logs.
JavaRoutineSynchronizer.UnsupportedOperation.Exception1=M\u00E9thode non impl\u00E9ment\u00E9e : org.talend.designer.codegen.JavaRoutineSynchronizer line:49
JavaRoutineSynchronizer.UnsupportedOperation.Exception2=M\u00E9thode non impl\u00E9ment\u00E9e : org.talend.designer.codegen.JavaRoutineSynchronizer line:58
JetSkeletonManager.unableLoad=Impossible de charger le fichier de cache de la mise \u00E0 jour du squelette

View File

@@ -10,11 +10,12 @@ CodeGenerator.getGraphicalNode2=------process.getGeneratingNodes()------
CodeGenerator.JET.TimeOut=JET\u306E\u521D\u671F\u5316\u51E6\u7406\u304C\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u3057\u307E\u3057\u305F
CodeGenerator.newLine=\n\n\n\n
CodeGenerator.Node.NotFound=\u73FE\u5728\u306E\u30D7\u30ED\u30BB\u30B9\u306B\u30CE\u30FC\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
CodeGenerator.Components.NotFound={0}: \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u6B20\u843D\u3057\u3066\u3044\u307E\u3059: {1}\u3002Studio\u3067 -D{2}=false\u3092\u4F7F\u3046\u3068\u3053\u306E\u30C1\u30A7\u30C3\u30AF\u304C\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u3001\u8B66\u544A\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u30ED\u30B0\u30D5\u30A1\u30A4\u30EB\u306B\u8A18\u9332\u3055\u308C\u307E\u3059\u3002
JavaRoutineSynchronizer.UnsupportedOperation.Exception1=\u30E1\u30BD\u30C3\u30C9\u304C\u5B9F\u88C5\u3055\u308C\u3066\u3044\u307E\u305B\u3093\\: org.talend.designer.codegen.JavaRoutineSynchronizer line\\:49
JavaRoutineSynchronizer.UnsupportedOperation.Exception2=\u30E1\u30BD\u30C3\u30C9\u304C\u5B9F\u88C5\u3055\u308C\u3066\u3044\u307E\u305B\u3093\\: org.talend.designer.codegen.JavaRoutineSynchronizer line\\:58
JetSkeletonManager.unableLoad=\u30B9\u30B1\u30EB\u30C8\u30F3\u66F4\u65B0\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
JetSkeletonManager.unableSave=\u30B9\u30B1\u30EB\u30C8\u30F3\u66F4\u65B0\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093
JetSkeletonManager.updateProblem=\u30B9\u30B1\u30EB\u30C8\u30F3\u6C38\u7D9A\u30C7\u30FC\u30BF\u66F4\u65B0\u6642\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F,
JetSkeletonManager.unableLoad=\u30B9\u30B1\u30EB\u30C8\u30F3\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
JetSkeletonManager.unableSave=\u30B9\u30B1\u30EB\u30C8\u30F3\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093
JetSkeletonManager.updateProblem=\u30B9\u30B1\u30EB\u30C8\u30F3\u6C38\u7D9A\u30C7\u30FC\u30BF\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6642\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F,
EmfEmittersPersistence.CodeGen.DataMissing=\u30B3\u30FC\u30C9\u751F\u6210\u306E\u30C7\u30FC\u30BF\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u5B8C\u5168\u306A\u30B3\u30FC\u30C9\u751F\u6210\u3092\u958B\u59CB\u3057\u3066\u3044\u307E\u3059\u3002
CodeGeneratorEmittersPoolFactory.PersitentData.Error=\u6301\u7D9A\u30C7\u30FC\u30BF\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093:
CodeGeneratorEmittersPoolFactory.JETEmitters.NoPresent=JETEmitter \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3001\u5168\u4F53\u306E\u518D\u521D\u671F\u5316\u304C\u5FC5\u8981\u3067\u3059\u3002
@@ -28,7 +29,7 @@ CodeGeneratorEmittersPoolFactory.initialException=\u521D\u671F\u5316\u4E2D\u306B
CodeGeneratorEmittersPoolFactory.initMessage=\u751F\u6210\u30A8\u30F3\u30B8\u30F3\u306E\u521D\u671F\u5316\u4E2D...
CodeGeneratorEmittersPoolFactory.jetEmitterInitialException=JetEmitter\u306E\u521D\u671F\u5316\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
CodeGeneratorEmittersPoolFactory.operationCanceled=\u64CD\u4F5C\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F
CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=\u30D1\u30EC\u30C3\u30C8\u3092\u66F4\u65B0
CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=\u30D1\u30EC\u30C3\u30C8\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
CodeGeneratorService.invalidLanguage1=\u7121\u52B9\u306A\u8A00\u8A9E\u30BF\u30A4\u30D7\u3067\u3059\u3002
CodeGeneratorService.invalidLanguage2=\u7121\u52B9\u306A\u8A00\u8A9E\u30BF\u30A4\u30D7\u3067\u3059\u3002
CodeGenInit.addMarkers=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306B\u30DE\u30FC\u30AB\u30FC\u3092\u8FFD\u52A0\u4E2D

View File

@@ -10,6 +10,7 @@ CodeGenerator.getGraphicalNode2=\u8FDB\u7A0B\u5F97\u5230\u751F\u6210\u8282\u70B9
CodeGenerator.JET.TimeOut=JET \u521D\u59CB\u5316\u8D85\u65F6
CodeGenerator.newLine=\n\n\n\n
CodeGenerator.Node.NotFound=\u5728\u5F53\u524D
CodeGenerator.Components.NotFound={0}: \u7EC4\u4EF6\u7F3A\u5931: {1}; \u5728 Studio \u6216\u547D\u4EE4\u884C\u4E2D\u4F7F\u7528 -D{2}=false \u53EF\u8DF3\u8FC7\u6B64\u9879\u68C0\u67E5\uFF0C\u540C\u65F6\u89E6\u53D1\u8B66\u544A\u6D88\u606F\u3002
JavaRoutineSynchronizer.UnsupportedOperation.Exception1=\u65B9\u6CD5\u672A\u5B9E\u65BD\uFF1Aorg.talend.designer.codegen.JavaRoutineSynchronizer line:49
JavaRoutineSynchronizer.UnsupportedOperation.Exception2=\u65B9\u6CD5\u672A\u5B9E\u65BD\uFF1Aorg.talend.designer.codegen.JavaRoutineSynchronizer line:58
JetSkeletonManager.unableLoad=\u65E0\u6CD5\u52A0\u8F7D\u4E3B\u5E72\u66F4\u65B0\u7F13\u5B58\u6587\u4EF6

View File

@@ -66,6 +66,7 @@ import org.talend.designer.codegen.model.CodeGeneratorEmittersPoolFactory;
import org.talend.designer.codegen.model.CodeGeneratorInternalTemplatesFactoryProvider;
import org.talend.designer.codegen.proxy.JetProxy;
import org.talend.designer.core.generic.model.Component;
import org.talend.designer.core.model.components.DummyComponent;
import org.talend.designer.runprocess.ProcessorUtilities;
/**
@@ -845,6 +846,25 @@ public class CodeGenerator implements ICodeGenerator {
IComponentFileNaming componentFileNaming = ComponentsFactoryProvider.getFileNamingInstance();
IComponent component = node.getComponent();
if (component instanceof DummyComponent) {
if (((DummyComponent) component).isMissingComponent()) {
String processName = "";
try {
IProcess proc = node.getProcess();
processName = proc.getName() + " " + proc.getVersion();
} catch (Exception e) {
ExceptionHandler.process(e);
}
if (IProcess.ERR_ON_COMPONENT_MISSING) {
throw new CodeGeneratorException(Messages.getString("CodeGenerator.Components.NotFound", processName,
component.getName(), IProcess.PROP_ERR_ON_COMPONENT_MISSING));
}
if (ECodePart.BEGIN.equals(part)) {
log.warn(Messages.getString("CodeGenerator.Components.NotFound", processName, component.getName(),
IProcess.PROP_ERR_ON_COMPONENT_MISSING));
}
}
}
// some code unification to handle all component types the same way.
String templateURI = component.getTemplateFolder() + TemplateUtil.DIR_SEP
+ componentFileNaming.getJetFileName(component.getTemplateNamePrefix(), language.getExtension(), part);

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,19 +8,19 @@ 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=\u66F4\u65B0
MyExtensionsComposite.ExtensionName=Extension\u540D
DownloadedExtensionsComposite.updateOperateStatus=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
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
MyExtensionsComposite.UpLoadNewVersionOperateStatus=\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9
MyExtensionsComposite.UpdateOperateStatus=\u66F4\u65B0
MyExtensionsComposite.UpdateOperateStatus=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
MyExtensionsComposite.ModifyOperateStatus=\u5909\u66F4
MyExtensionsComposite.DeleteOperateStatus=\u524A\u9664
MyExtensionsComposite.Form.Return=\u623B\u308A\u5024
@@ -45,7 +45,7 @@ MyExtensionsComposite.Form.Upload.Browse.SelectFile=\u30A2\u30C3\u30D7\u30ED\u30
MyExtensionsComposite.Form.DeleteExtensionTile=Extension\u524A\u9664
MyExtensionsComposite.Form.DeleteExtensionMessage=\u3053\u306E\u62E1\u5F35\u5B50\u3092\u524A\u9664\u3057\u307E\u3059\u304B?
MyExtensionsComposite.Form.UploadExtension=Extension\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9
MyExtensionsComposite.Form.UpdateExtension=Extension\u66F4\u65B0
MyExtensionsComposite.Form.UpdateExtension=Extension\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
MyExtensionsComposite.Form.ModifyExtension=Extension\u4FEE\u6B63
Exchange.logon.error=Exchange\u30E6\u30FC\u30B6\u30FC\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u521D\u671F\u8A2D\u5B9A\u3092\u4F7F\u7528\u3057\u3066\u767B\u9332\u3057\u3066\u304F\u3060\u3055\u3044\u3002
RefreshJob.FindExtensions.Title=\u53D6\u5F97\u53EF\u80FD\u306Aextensions
@@ -77,7 +77,7 @@ DownloadComponenentsAction_failureMessage=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u
DownloadComponenentsAction.installExchange=Exchange\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB
DownloadComponenentsAction.DownloadTaskTitle=Exchange\u304B\u3089\u30D5\u30A1\u30A4\u30EB\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9
DownloadComponenentsAction.DownloadTaskName=\u30D5\u30A1\u30A4\u30EB\u306E\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D URL \\:
DownloadComponenentsAction.ReloadPalette=\u30D1\u30EC\u30C3\u30C8\u306E\u66F4\u65B0...
DownloadComponenentsAction.ReloadPalette=\u30D1\u30EC\u30C3\u30C8\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8...
DownloadComponenentsAction.DownloadFailure=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u5931\u6557\u3002
DownloadComponenentsAction.DownloadFailureTip=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u8A2D\u5B9A\u3092\u5909\u66F4\u3057\u3066\u304F\u3060\u3055\u3044\u3002
DownloadComponenentsAction.installComponentsTitle=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB
@@ -85,17 +85,17 @@ ExchangeWebService.insertionExtensionSuccessful=Extension\u306E\u30A4\u30F3\u30B
ExchangeWebService.downloadingExtensionSuccessful=Extension\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u6210\u529F\u3002
ExchangeWebService.deleteExtensionSuccessful=Extension\u524A\u9664\u6210\u529F\u3002
ExchangeWebService.insertReviewSuccessful=Review\u633F\u5165\u6210\u529F\u3002
ExchangeWebService.updateRevisionSuccessful=\u30EA\u30D3\u30B8\u30E7\u30F3\u66F4\u65B0\u6210\u529F\u3002
ExchangeWebService.updateRevisionSuccessful=\u30EA\u30D3\u30B8\u30E7\u30F3\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6210\u529F\u3002
ExchangeWebService.insertionRevisionSuccessful=\u30EA\u30D3\u30B8\u30E7\u30F3\u633F\u5165\u6210\u529F\u3002
ImportExchangeDialog.dialogTitle=Talend Exchange \u304B\u3089\u9805\u76EE\u306E\u9078\u629E
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
ImportExchangeDialog.download.extensions=\u62E1\u5F35\u6A5F\u80FD\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D\u3067\u3059\u3002\u66AB\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u3002
ImportExchangeDialog.REFRESH_BUTTON=\u66F4\u65B0
ImportExchangeDialog.REFRESHING_PROGRESSBAR=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5\u4E2D\u3067\u3059\u3002\u66AB\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u3002
ImportExchangeDialog.REFRESHING_PROGRESSBAR=\u66F4\u65B0\u4E2D\u3067\u3059\u3002\u66AB\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u3002
ImportExchangeDialog.OPERATION_CANCELLED=\u64CD\u4F5C\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F

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

@@ -37,7 +37,18 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.5</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
<version>1.2.19</version>
</dependency>
<!-- Spring 3 dependencies -->
<dependency>
<groupId>org.springframework</groupId>

View File

@@ -1,77 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.components</groupId>
<artifactId>checkArchive</artifactId>
<version>1.2-20210901</version>
<name>checkArchive</name>
<description>Dependence for tFileArchive and tFileUnAchive</description>
<url>http://maven.apache.org</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
<distribution>may be downloaded from the Maven repository</distribution>
</license>
</licenses>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
<java.source.version>1.8</java.source.version>
</properties>
<distributionManagement>
<snapshotRepository>
<id>talend_nexus_deployment</id>
<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</snapshotRepository>
<repository>
<id>talend_nexus_deployment</id>
<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</distributionManagement>
<dependencies>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-compress -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.21</version>
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>src/main/java</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>${java.source.version}</source>
<target>${java.source.version}</target>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<compilerArgument>-XDignore.symbol.file</compilerArgument>
<fork>true</fork>
</configuration>
</plugin>
</plugins>
</build>
</project>

View File

@@ -7,7 +7,7 @@
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<packaging>jar</packaging>
<version>2.4.6-talend</version>
<version>2.4.7-talend</version>
<name>json-lib</name>
<properties>
@@ -230,9 +230,9 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
<version>1.2.19</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>

View File

@@ -48,6 +48,7 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.StringReader;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -172,6 +173,11 @@ public class XMLSerializer {
* flag for if parse empty elements as empty strings
*/
private boolean useEmptyStrings;
/**
* flag to use scientific notation while working with Float values.
*/
private boolean useScientificNotation;
/**
* Creates a new XMLSerializer with default options.<br>
@@ -205,6 +211,7 @@ public class XMLSerializer {
setKeepCData( false );
setEscapeLowerChars( false );
setKeepArrayName( false );
setUseScientificNotation( false );
}
/**
@@ -360,7 +367,15 @@ public class XMLSerializer {
return typeHintsEnabled;
}
/**
* @return the useScientificNotation value
*/
public boolean isUseScientificNotation() {
return useScientificNotation;
}
/**
* Creates a JSON value from a XML string.
*
* @param xml A well-formed xml document in a String
@@ -652,6 +667,15 @@ public class XMLSerializer {
this.typeHintsCompatibility = typeHintsCompatibility;
}
/**
* Sets whether to use scientific notation while working with Float values.
* @param useScientificNotation Value of the useScientificNotation to set.
*/
public void setUseScientificNotation(boolean useScientificNotation) {
this.useScientificNotation = useScientificNotation;
}
/**
* Sets wether JSON types will be included as attributes.
*/
@@ -1335,12 +1359,12 @@ public class XMLSerializer {
jsonArray.element(Integer.valueOf(element.getValue()));
}
} catch (NumberFormatException e) {
jsonArray.element(Double.valueOf(element.getValue()));
jsonArray.element(processFloatValues(element));
}
} else if (type.compareToIgnoreCase(JSONTypes.INTEGER) == 0) {
jsonArray.element(Integer.valueOf(element.getValue()));
} else if (type.compareToIgnoreCase(JSONTypes.FLOAT) == 0) {
jsonArray.element(Double.valueOf(element.getValue()));
jsonArray.element(processFloatValues(element));
} else if (type.compareToIgnoreCase(JSONTypes.FUNCTION) == 0) {
String[] params = null;
String text = element.getValue();
@@ -1371,6 +1395,14 @@ public class XMLSerializer {
}
}
}
private Object processFloatValues(Element element) {
if (!isUseScientificNotation()) {
return new BigDecimal(element.getValue());
} else {
return Double.valueOf(element.getValue());
}
}
private void setValue( JSONObject jsonObject, Element element, String defaultType ) {
String clazz = getClass( element );
@@ -1423,12 +1455,12 @@ public class XMLSerializer {
setOrAccumulate(jsonObject, key, Integer.valueOf(element.getValue()));
}
} catch (NumberFormatException e) {
setOrAccumulate(jsonObject, key, Double.valueOf(element.getValue()));
setOrAccumulate(jsonObject, key, processFloatValues(element));
}
} else if (type.compareToIgnoreCase(JSONTypes.INTEGER) == 0) {
setOrAccumulate(jsonObject, key, Integer.valueOf(element.getValue()));
} else if (type.compareToIgnoreCase(JSONTypes.FLOAT) == 0) {
setOrAccumulate(jsonObject, key, Double.valueOf(element.getValue()));
setOrAccumulate(jsonObject, key, processFloatValues(element));
} else if (type.compareToIgnoreCase(JSONTypes.FUNCTION) == 0) {
String[] params = null;
String text = element.getValue();

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend</groupId>
<artifactId>talendMQRFH2</artifactId>
<version>1.0.1-20190206</version>
<version>1.2.0-20220707</version>
<packaging>jar</packaging>
<licenses>
@@ -44,20 +44,10 @@
</distributionManagement>
<dependencies>
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>com.ibm.mq</artifactId>
<version>8.0.0.9</version>
</dependency>
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>com.ibm.mqjms</artifactId>
<version>8.0.0.9</version>
</dependency>
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>com.ibm.mq.allclient</artifactId>
<version>8.0.0.9</version>
<version>9.2.5.0</version>
</dependency>
<dependency>
<groupId>org.talend.libraries</groupId>
@@ -75,9 +65,9 @@
<version>6.0.0</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
<version>1.2.19</version>
</dependency>
</dependencies>

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

@@ -113,9 +113,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
<version>1.2.19</version>
<scope>test</scope>
</dependency>
<!-- JUnit -->

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>
@@ -72,9 +67,9 @@
<version>4.1.2</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
<version>1.2.19</version>
</dependency>
<!--test-->

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

@@ -53,9 +53,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
<version>1.2.19</version>
<scope>test</scope>
</dependency>
<dependency>

View File

@@ -4,7 +4,7 @@
<groupId>org.talend</groupId>
<artifactId>talend-httputil</artifactId>
<name>talend-httputil</name>
<version>1.0.6</version>
<version>1.0.7</version>
<licenses>
<license>
@@ -28,7 +28,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.11.4</version>
<version>2.13.2.2</version>
</dependency>
<dependency>
@@ -36,14 +36,6 @@
<artifactId>json-lib</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.0</version>
<type>jar</type>
<optional>true</optional>
</dependency>
</dependencies>
<distributionManagement>

View File

@@ -1,14 +1,9 @@
package org.talend.http;
import java.util.List;
import org.apache.http.entity.ContentType;
import org.apache.http.util.EntityUtils;
import org.apache.http.entity.ContentType;
import net.sf.json.JSONObject;
import java.util.ArrayList;
import org.apache.http.entity.ContentType;
import org.apache.http.util.EntityUtils;
public class HttpUtil {

View File

@@ -6,7 +6,7 @@
<groupId>org.talend.components.lib</groupId>
<artifactId>job-audit</artifactId>
<version>1.4</version>
<version>1.5</version>
<licenses>
<license>

View File

@@ -30,5 +30,8 @@ public interface JobAuditLogger extends EventAuditLogger {
@AuditEvent(category = "schema", message = "{connection_name} : {schema} from {source_id} to {target_id}", level = LogLevel.INFO)
void schema(Context context);
@AuditEvent(category = "exception", message = "Exception", level = LogLevel.INFO)
void exception(Context context);
}

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.components</groupId>
<artifactId>talend-mscrm</artifactId>
<version>3.11-20220124</version>
<version>3.14-20220707</version>
<packaging>jar</packaging>
<name>talend-mscrm</name>
@@ -26,14 +26,15 @@
<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>
<jackson.version>2.11.4</jackson.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>
<!-- plugin's versions -->
<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>
@@ -68,7 +69,7 @@
</releases>
</repository>
</distributionManagement>
<dependencies>
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -76,9 +77,9 @@
<version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.5</version>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
<version>1.2.19</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -101,7 +102,7 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-client-core</artifactId>
@@ -143,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>
@@ -156,13 +152,24 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
<version>${jackson-databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<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

@@ -6,7 +6,7 @@
<groupId>org.talend.components</groupId>
<artifactId>talend-scp-helper</artifactId>
<version>1.0</version>
<version>1.1</version>
<licenses>
<license>
@@ -19,7 +19,7 @@
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<ssd.version>2.5.1</ssd.version>
<ssd.version>2.8.0</ssd.version>
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
</properties>

View File

@@ -1,31 +1,32 @@
package org.talend.components.talendscp;
import org.apache.sshd.client.channel.ChannelExec;
import org.apache.sshd.scp.client.AbstractScpClient;
import org.apache.sshd.scp.client.DefaultScpClient;
import org.apache.sshd.scp.client.DefaultScpStreamResolver;
import org.apache.sshd.scp.client.ScpClient;
import org.apache.sshd.client.session.ClientSession;
import org.apache.sshd.common.FactoryManager;
import org.apache.sshd.common.file.FileSystemFactory;
import org.apache.sshd.common.file.util.MockFileSystem;
import org.apache.sshd.common.file.util.MockPath;
import org.apache.sshd.scp.common.ScpFileOpener;
import org.apache.sshd.scp.common.ScpHelper;
import org.apache.sshd.common.util.ValidateUtils;
import org.apache.sshd.scp.common.ScpTransferEventListener;
import org.apache.sshd.scp.common.helpers.ScpTimestampCommandDetails;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.FileSystem;
import java.nio.file.Path;
import java.nio.file.attribute.FileTime;
import java.nio.file.attribute.PosixFilePermission;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import org.apache.sshd.client.channel.ChannelExec;
import org.apache.sshd.client.scp.AbstractScpClient;
import org.apache.sshd.client.scp.DefaultScpClient;
import org.apache.sshd.client.scp.DefaultScpStreamResolver;
import org.apache.sshd.client.scp.ScpClient;
import org.apache.sshd.client.session.ClientSession;
import org.apache.sshd.common.FactoryManager;
import org.apache.sshd.common.file.FileSystemFactory;
import org.apache.sshd.common.file.util.MockFileSystem;
import org.apache.sshd.common.file.util.MockPath;
import org.apache.sshd.common.scp.ScpFileOpener;
import org.apache.sshd.common.scp.ScpHelper;
import org.apache.sshd.common.scp.ScpTimestamp;
import org.apache.sshd.common.scp.ScpTransferEventListener;
import org.apache.sshd.common.util.ValidateUtils;
/*
What we do here is just overwrite the ScpHelper to throw Exception when scp return status 1
@@ -40,7 +41,8 @@ public class TalendScpClient extends DefaultScpClient {
}
@Override public void upload(InputStream local, String remote, long size, Collection<PosixFilePermission> perms,
ScpTimestamp time) throws IOException {
ScpTimestampCommandDetails time) throws IOException {
int namePos = ValidateUtils.checkNotNullAndNotEmpty(remote, "No remote location specified").lastIndexOf('/');
String name = (namePos < 0) ?
remote :

View File

@@ -1,11 +1,11 @@
package org.talend.components.talendscp;
import org.apache.sshd.client.scp.AbstractScpClientCreator;
import org.apache.sshd.client.scp.ScpClient;
import org.apache.sshd.client.scp.ScpClientCreator;
import org.apache.sshd.scp.client.AbstractScpClientCreator;
import org.apache.sshd.scp.client.ScpClient;
import org.apache.sshd.scp.client.ScpClientCreator;
import org.apache.sshd.client.session.ClientSession;
import org.apache.sshd.common.scp.ScpFileOpener;
import org.apache.sshd.common.scp.ScpTransferEventListener;
import org.apache.sshd.scp.common.ScpFileOpener;
import org.apache.sshd.scp.common.ScpTransferEventListener;
public class TalendScpClientCreator extends AbstractScpClientCreator implements ScpClientCreator {
public static final TalendScpClientCreator INSTANCE = new TalendScpClientCreator();

View File

@@ -6,11 +6,12 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.FileSystem;
import org.apache.sshd.common.scp.ScpException;
import org.apache.sshd.common.scp.ScpFileOpener;
import org.apache.sshd.common.scp.ScpHelper;
import org.apache.sshd.common.scp.ScpTransferEventListener;
import org.apache.sshd.scp.common.ScpException;
import org.apache.sshd.scp.common.ScpFileOpener;
import org.apache.sshd.scp.common.ScpHelper;
import org.apache.sshd.scp.common.ScpTransferEventListener;
import org.apache.sshd.common.session.Session;
import org.apache.sshd.scp.common.helpers.ScpAckInfo;
public class TalendScpHelper extends ScpHelper {
@@ -20,8 +21,9 @@ public class TalendScpHelper extends ScpHelper {
}
@Override
public int readAck(boolean canEof) throws IOException {
int c = in.read();
public ScpAckInfo readAck(boolean canEof) throws IOException {
final ScpAckInfo scpAckInfo = ScpAckInfo.readAck(this.in, this.csIn, canEof);
int c = scpAckInfo == null ? -1 : scpAckInfo.getStatusCode();
switch (c) {
case -1:
if (log.isDebugEnabled()) {
@@ -31,12 +33,12 @@ public class TalendScpHelper extends ScpHelper {
throw new EOFException("readAck - EOF before ACK");
}
break;
case OK:
case ScpAckInfo.OK:
if (log.isDebugEnabled()) {
log.debug("readAck({})[EOF={}] read OK", this, canEof);
}
break;
case WARNING: {
case ScpAckInfo.WARNING: {
if (log.isDebugEnabled()) {
log.debug("readAck({})[EOF={}] read warning message", this, canEof);
}
@@ -45,7 +47,7 @@ public class TalendScpHelper extends ScpHelper {
log.warn("readAck({})[EOF={}] - Received warning: {}", this, canEof, line);
throw new ScpException("received error: " + line, c);
}
case ERROR: {
case ScpAckInfo.ERROR: {
if (log.isDebugEnabled()) {
log.debug("readAck({})[EOF={}] read error message", this, canEof);
}
@@ -58,6 +60,6 @@ public class TalendScpHelper extends ScpHelper {
default:
break;
}
return c;
return scpAckInfo;
}
}

View File

@@ -60,9 +60,9 @@
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
<version>1.2.19</version>
</dependency>

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.components</groupId>
<artifactId>talend-ws</artifactId>
<version>1.0.5-20210629</version>
<version>1.0.6-20220304</version>
<packaging>jar</packaging>
<licenses>
@@ -20,7 +20,7 @@
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
<cxf.version>3.3.10</cxf.version>
<cxf.version>3.4.4</cxf.version>
<odata.version>4.3.0</odata.version>
<slf4j.version>1.7.12</slf4j.version>
<httpclient.version>4.5.13</httpclient.version>

View File

@@ -1,7 +1,7 @@
org.talend.ws.exception.IllegalPropertyAccessException={0} \u30D7\u30ED\u30D1\u30C6\u30A3\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\u3002\u3053\u308C\u306F {1} \u578B\u306E\u305F\u3081\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\u3002
org.talend.ws.exception.NoSuchPropertyException=\u30BF\u30A4\u30D7{1}\u306E\u30D7\u30ED\u30D1\u30C6\u30A3{0}\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
org.talend.ws.exception.Instantiation={0} \u578B\u306E\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002
org.talend.ws.exception.InvocationTargetPropertyAccessor=\u30D7\u30ED\u30D1\u30C6\u30A3\u30A2\u30AF\u30BB\u30B9\u306B\u3088\u308A\u3001\u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F\uFF1A\u30AF\u30E9\u30B9 {1} \u306E\u30D7\u30ED\u30D1\u30C6\u30A3 {0}
org.talend.ws.exception.InvocationTargetPropertyAccessor=\u30D7\u30ED\u30D1\u30C6\u30A3\u30A2\u30AF\u30BB\u30C3\u30B5\u30FC\u304C\u4F8B\u5916\u3092\u8FD4\u3057\u307E\u3057\u305F: \u30AF\u30E9\u30B9 {1} \u306E\u30D7\u30ED\u30D1\u30C6\u30A3 {0}
org.talend.ws.exception.illegalAccessValueOf=\u5217\u6319\u578B {0} \u306EvalueOf\u30E1\u30BD\u30C3\u30C9\u3092\u547C\u3073\u51FA\u3059\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
org.talend.ws.exception.Unknown=\u4E0D\u660E\u306A\u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F
org.talend.ws.exception.InvalidEnumValueException=\u5024 {0} \u306Fenum\u578B {1} \u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002

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>
@@ -83,9 +78,9 @@
<version>4.1.2</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
<version>1.2.19</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
<dependency>

View File

@@ -5,7 +5,7 @@
<groupId>org.talend</groupId>
<artifactId>talendMQConnectionUtil</artifactId>
<version>1.0.1-20190215</version>
<version>1.2.0-20220707</version>
<packaging>jar</packaging>
<name>talendMQConnectionUtil</name>
@@ -63,13 +63,8 @@
</dependency>
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>com.ibm.mq</artifactId>
<version>8.0.0.9</version>
</dependency>
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>com.ibm.mqjms</artifactId>
<version>8.0.0.9</version>
<artifactId>com.ibm.mq.allclient</artifactId>
<version>9.2.5.0</version>
</dependency>
<dependency>
<groupId>javax.resource</groupId>
@@ -79,7 +74,7 @@
<dependency>
<groupId>org.talend</groupId>
<artifactId>talendMQRFH2</artifactId>
<version>1.0.1-20190206</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>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</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

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.components</groupId>
<artifactId>talendzip</artifactId>
<version>1.2-20210901</version>
<version>1.3</version>
<licenses>
<license>
@@ -61,7 +61,7 @@
<dependency>
<groupId>net.lingala.zip4j</groupId>
<artifactId>zip4j</artifactId>
<version>1.3.3</version>
<version>2.10.0</version>
</dependency>
<dependency>
@@ -70,10 +70,5 @@
<version>1.21</version>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>checkArchive</artifactId>
<version>1.2-20210901</version>
</dependency>
</dependencies>
</project>

View File

@@ -1,184 +1,183 @@
package org.talend.archive;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.zip.GZIPInputStream;
import javax.crypto.Cipher;
import javax.crypto.CipherInputStream;
import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.PBEParameterSpec;
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipFile;
// import javax.crypto.Cipher;
public class IntegrityUtil {
/**
* Is used to check if the zip file is corrupted/destroyed
*
* @param file
* @return
*/
public static boolean isZipValid(final File file) {
ZipFile zipFile = null;
try {
zipFile = new ZipFile(file);
return true;
} catch (IOException e) {
return false;
} finally {
try {
if (zipFile != null) {
zipFile.close();
zipFile = null;
}
} catch (IOException e) {
}
}
}
public static void validate(final File file) {
ZipFile zipFile = null;
try {
zipFile = new ZipFile(file);
} catch (IOException e) {
} finally {
try {
if (zipFile != null) {
zipFile.close();
zipFile = null;
}
} catch (IOException e) {
}
}
}
/**
* To check if the encrpted zip file is corrupted or not
*
* @param file
* @param password
* @return
*/
public static boolean isEncryptedZipValid(final File file, String password) {
ZipArchiveInputStream input = null;
InputStream target = null;
try {
target = new FileInputStream(file);
target = new CipherInputStream(target, createCipher(Cipher.DECRYPT_MODE, password));
input = new ZipArchiveInputStream(target);
ArchiveEntry entry = input.getNextEntry();
return true;
} catch (IOException e) {
return false;
} catch (Exception e) {
return false;
} finally {
try {
if (input != null) {
input.close();
input = null;
}
if (target != null) {
target.close();
target = null;
}
} catch (IOException e) {
}
}
}
/**
* Used to check tar.gz/.tgz/.gz file is corrupted/destroyed
*
* @param fileName
* @return
*/
public static boolean isGZIPValid(final String fileName) {
GZIPInputStream inputStream = null;
InputStream is = null;
try {
is = new FileInputStream(new File(fileName));
inputStream = new GZIPInputStream(is);
return true;
} catch (IOException e) {
return false;
}finally {
try {
if (inputStream != null) {
inputStream.close();
inputStream = null;
} else if(is != null) {
is.close();
is = null;
}
} catch (IOException e) {
}
}
}
/**
* Used to check tar.tar file is corrupted/destroyed
*
* @param fileName
* @return
*/
public static boolean isTarValid(final String fileName) {
TarArchiveInputStream inputStream = null;
InputStream is = null;
try {
is = new FileInputStream(new File(fileName));
inputStream = new TarArchiveInputStream(is);
return inputStream.canReadEntryData(inputStream.getNextEntry());
} catch (IOException e) {
return false;
}finally {
try {
if (inputStream != null) {
inputStream.close();
inputStream = null;
} else if(is != null) {
is.close();
is = null;
}
} catch (IOException e) {
}
}
}
/**
*
* @param mode
* @param password
* @return
* @throws Exception
*/
public static Cipher createCipher(int mode, String password) throws Exception {
String alg = "PBEWithSHA1AndDESede"; // BouncyCastle has better algorithms
PBEKeySpec keySpec = new PBEKeySpec(password.toCharArray());
SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(alg);
SecretKey secretKey = keyFactory.generateSecret(keySpec);
Cipher cipher = Cipher.getInstance("PBEWithSHA1AndDESede");
cipher.init(mode, secretKey, new PBEParameterSpec("saltsalt".getBytes(), 2000));
return cipher;
}
}
package com.talend.compress.zip;
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipFile;
import javax.crypto.Cipher;
import javax.crypto.CipherInputStream;
import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.PBEParameterSpec;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.zip.GZIPInputStream;
// import javax.crypto.Cipher;
public class IntegrityUtil {
/**
* Is used to check if the zip file is corrupted/destroyed
*
* @param file
* @return
*/
public static boolean isZipValid(final File file) {
ZipFile zipFile = null;
try {
zipFile = new ZipFile(file);
return true;
} catch (IOException e) {
return false;
} finally {
try {
if (zipFile != null) {
zipFile.close();
zipFile = null;
}
} catch (IOException e) {
}
}
}
public static void validate(final File file) {
ZipFile zipFile = null;
try {
zipFile = new ZipFile(file);
} catch (IOException e) {
} finally {
try {
if (zipFile != null) {
zipFile.close();
zipFile = null;
}
} catch (IOException e) {
}
}
}
/**
* To check if the encrpted zip file is corrupted or not
*
* @param file
* @param password
* @return
*/
public static boolean isEncryptedZipValid(final File file, String password) {
ZipArchiveInputStream input = null;
InputStream target = null;
try {
target = new FileInputStream(file);
target = new CipherInputStream(target, createCipher(Cipher.DECRYPT_MODE, password));
input = new ZipArchiveInputStream(target);
ArchiveEntry entry = input.getNextEntry();
return true;
} catch (IOException e) {
return false;
} catch (Exception e) {
return false;
} finally {
try {
if (input != null) {
input.close();
input = null;
}
if (target != null) {
target.close();
target = null;
}
} catch (IOException e) {
}
}
}
/**
* Used to check tar.gz/.tgz/.gz file is corrupted/destroyed
*
* @param fileName
* @return
*/
public static boolean isGZIPValid(final String fileName) {
GZIPInputStream inputStream = null;
InputStream is = null;
try {
is = new FileInputStream(new File(fileName));
inputStream = new GZIPInputStream(is);
return true;
} catch (IOException e) {
return false;
}finally {
try {
if (inputStream != null) {
inputStream.close();
inputStream = null;
} else if(is != null) {
is.close();
is = null;
}
} catch (IOException e) {
}
}
}
/**
* Used to check tar.tar file is corrupted/destroyed
*
* @param fileName
* @return
*/
public static boolean isTarValid(final String fileName) {
TarArchiveInputStream inputStream = null;
InputStream is = null;
try {
is = new FileInputStream(new File(fileName));
inputStream = new TarArchiveInputStream(is);
return inputStream.canReadEntryData(inputStream.getNextEntry());
} catch (IOException e) {
return false;
}finally {
try {
if (inputStream != null) {
inputStream.close();
inputStream = null;
} else if(is != null) {
is.close();
is = null;
}
} catch (IOException e) {
}
}
}
/**
*
* @param mode
* @param password
* @return
* @throws Exception
*/
public static Cipher createCipher(int mode, String password) throws Exception {
String alg = "PBEWithSHA1AndDESede"; // BouncyCastle has better algorithms
PBEKeySpec keySpec = new PBEKeySpec(password.toCharArray());
SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(alg);
SecretKey secretKey = keyFactory.generateSecret(keySpec);
Cipher cipher = Cipher.getInstance("PBEWithSHA1AndDESede");
cipher.init(mode, secretKey, new PBEParameterSpec("saltsalt".getBytes(), 2000));
return cipher;
}
}

View File

@@ -1,10 +1,11 @@
package com.talend.compress.zip;
import java.io.File;
import java.nio.charset.Charset;
import java.util.List;
import java.util.Optional;
import net.lingala.zip4j.core.ZipFile;
import net.lingala.zip4j.ZipFile;
import net.lingala.zip4j.model.FileHeader;
public class Unzip {
@@ -96,9 +97,10 @@ public class Unzip {
"Please enter the password and try again..");
}
ZipFile zipFile = new ZipFile(sourceZip);
ZipFile zipFile = new ZipFile(sourceZip,password.toCharArray());
if(encording != null){
zipFile.setFileNameCharset(encording);
zipFile.setCharset(Charset.forName(encording));
}
if (checkArchive) {
@@ -108,10 +110,6 @@ public class Unzip {
}
}
if (zipFile.isEncrypted()) {
zipFile.setPassword(password);
}
List fileHeaderList = zipFile.getFileHeaders();
if (fileHeaderList == null) {
@@ -130,7 +128,7 @@ public class Unzip {
filename = filename.substring(filename.lastIndexOf('/') + 1);
}
zipFile.extractFile(fileHeader, targetDir, null, filename);
zipFile.extractFile(fileHeader, targetDir, filename);
util.addUnzippedFiles(targetDir, filename);
}
}
@@ -147,7 +145,7 @@ public class Unzip {
}
if (checkArchive) {
if (!org.talend.archive.IntegrityUtil.isEncryptedZipValid(file,
if (!IntegrityUtil.isEncryptedZipValid(file,
password)) {
throw new RuntimeException("The file " + sourceZip
+ " is corrupted, process terminated...");
@@ -158,7 +156,7 @@ public class Unzip {
try {
is = new java.io.FileInputStream(sourceZip);
is = new javax.crypto.CipherInputStream(is,
org.talend.archive.IntegrityUtil.createCipher(
IntegrityUtil.createCipher(
javax.crypto.Cipher.DECRYPT_MODE, password));
org.apache.commons.compress.archivers.zip.ZipArchiveInputStream input = new org.apache.commons.compress.archivers.zip.ZipArchiveInputStream(
new java.io.BufferedInputStream(is),Optional.ofNullable(encording).orElse("UTF8"));
@@ -184,7 +182,7 @@ public class Unzip {
// apache common compress impl
public void doUnzipWithoutDecryption() throws Exception {
if (checkArchive
&& !org.talend.archive.IntegrityUtil
&& !IntegrityUtil
.isZipValid(new java.io.File(sourceZip))) {
Thread.sleep(1000); // To make the process terminated after the
// System.out.println

View File

@@ -5,16 +5,20 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.zip.GZIPOutputStream;
import net.lingala.zip4j.core.ZipFile;
import net.lingala.zip4j.ZipFile;
import net.lingala.zip4j.model.ZipParameters;
import net.lingala.zip4j.util.Zip4jConstants;
import net.lingala.zip4j.model.enums.AesKeyStrength;
import net.lingala.zip4j.model.enums.CompressionLevel;
import net.lingala.zip4j.model.enums.CompressionMethod;
import net.lingala.zip4j.model.enums.EncryptionMethod;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.compress.compressors.gzip.GzipUtils;
@@ -26,7 +30,7 @@ public class Zip {
private String targetZip;
private boolean overwriteExistTargetZip = true;
private boolean makeTargetDir = false;
private int compressLevel = 4;
private CompressionLevel compressLevel = CompressionLevel.MEDIUM_FAST;
private String encoding = "ISO-8859-15";
private boolean allFiles = true;
@@ -40,8 +44,8 @@ public class Zip {
private boolean useZip4jEncryption = false;
private int encryptionMethod = Zip4jConstants.ENC_METHOD_AES;
private int aesKeyStrength = Zip4jConstants.AES_STRENGTH_256;
private EncryptionMethod encryptionMethod = EncryptionMethod.AES;
private AesKeyStrength aesKeyStrength = AesKeyStrength.KEY_STRENGTH_256;
private String archiveFormat = "zip";
private boolean syncFlush;
@@ -79,19 +83,29 @@ public class Zip {
}
public void setCompressLevel(int compressLevel) {
this.compressLevel = compressLevel;
switch (compressLevel){
case 0:
this.compressLevel = CompressionLevel.NO_COMPRESSION;
break;
case 4:
this.compressLevel = CompressionLevel.MEDIUM_FAST;
break;
case 9:
this.compressLevel = CompressionLevel.ULTRA;
break;
}
}
public void setMakeTargetDir(boolean makeTargetDir) {
this.makeTargetDir = makeTargetDir;
}
public void setEncryptionMethod(int encryptionMethod) {
this.encryptionMethod = encryptionMethod;
public void setEncryptionMethod(String encryptionMethod) {
this.encryptionMethod = EncryptionMethod.valueOf(encryptionMethod);
}
public void setAesKeyStrength(int aesKeyStrength) {
this.aesKeyStrength = aesKeyStrength;
this.aesKeyStrength = AesKeyStrength.getAesKeyStrengthFromRawCode(aesKeyStrength);
}
public String getArchiveFormat() {
@@ -185,7 +199,7 @@ public class Zip {
targetFile.setLastModified(System.currentTimeMillis());
FileOutputStream fos = new FileOutputStream(targetFile);
final boolean syncFlush = this.syncFlush;
final int compressLevel = this.compressLevel;
final int compressLevel = this.compressLevel.getLevel();
TarArchiveOutputStream taos = new TarArchiveOutputStream(new GZIPOutputStream(fos, syncFlush) {
{
this.def.setLevel(compressLevel);
@@ -222,7 +236,7 @@ public class Zip {
OutputStream out = new FileOutputStream(tarFile);
try {
final boolean syncFlush = this.syncFlush;
final int compressLevel = this.compressLevel;
final int compressLevel = this.compressLevel.getLevel();
GZIPOutputStream gcos = new GZIPOutputStream(out, syncFlush) {
{
this.def.setLevel(compressLevel);
@@ -247,7 +261,7 @@ public class Zip {
try {
output_stream = new java.io.FileOutputStream(targetZip);
if (isEncrypted && !"".equals(password)) {
output_stream = new javax.crypto.CipherOutputStream(output_stream, org.talend.archive.IntegrityUtil.createCipher(
output_stream = new javax.crypto.CipherOutputStream(output_stream, IntegrityUtil.createCipher(
javax.crypto.Cipher.ENCRYPT_MODE, password));
}
} catch (Exception e) {
@@ -260,7 +274,7 @@ public class Zip {
org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream out = null;
out = new org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream(
new java.io.BufferedOutputStream(output_stream));
out.setLevel(compressLevel);
out.setLevel(compressLevel.getLevel());
// set filename & comment encoding
out.setEncoding(encoding);
if ("ALWAYS".equals(zip64Mode)) {
@@ -302,26 +316,26 @@ public class Zip {
// zip4j impl
private void doZip2(final File source, final List<File> list) throws Exception {
ZipFile zipFile = new ZipFile(targetZip);
ZipFile zipFile = new ZipFile(targetZip,password.toCharArray());
if ("UTF-8".equalsIgnoreCase(encoding)) {
encoding = "UTF8";
}
zipFile.setFileNameCharset(encoding);
zipFile.setCharset(Charset.forName(encoding));
ZipParameters params = new ZipParameters();
params.setCompressionMethod(Zip4jConstants.COMP_DEFLATE);
params.setCompressionMethod(CompressionMethod.DEFLATE);
params.setCompressionLevel(compressLevel);
if (isEncrypted && !"".equals(password)) {
params.setEncryptFiles(true);
params.setEncryptionMethod(encryptionMethod);
if (Zip4jConstants.ENC_METHOD_AES == encryptionMethod) {
if (encryptionMethod == EncryptionMethod.AES) {
params.setAesKeyStrength(aesKeyStrength);
}
params.setPassword(password);
}
params.setDefaultFolderPath(source.getAbsoluteFile().getPath());
zipFile.addFiles((ArrayList) list, params);
zipFile.addFiles(list, params);
}
}

View File

@@ -19,8 +19,6 @@ bin.excludes = components/tAlfrescoOutput/wstx-lgpl-3.2.7.jar,\
components/tRSSInput/nekohtml.jar,\
components/tAlfrescoOutput/wstx-lgpl-3.2.7.jar,\
components/tAdvancedXMLMapHash/trove.jar,\
components/tCloudStart/logback-core-1.0.9.jar,\
components/tCloudStart/logback-classic-1.0.9.jar,\
components/tLineChart/jcommon-1.0.6.jar,\
components/tMomInput/jnp-client.jar,\
components/tMomInput/javassist.jar,\

View File

@@ -20,21 +20,21 @@ CLEAR_TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF\u306E\u30AF\u30EA\u3
COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
DATA_ACTION.ITEM.DELETE=\u524A\u9664
DATA_ACTION.ITEM.INSERT=\u633F\u5165
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3078\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DBNAME.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u4E86
ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u30AD\u30FC
FIELD_OPTIONS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
FIELD_OPTIONS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
FIELD_OPTIONS.ITEM.UPDATE_KEY=\u66F4\u65B0\u30AD\u30FC
FIELD_OPTIONS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
FIELD_OPTIONS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30AD\u30FC
FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3
HELP=org.talend.help.tInformixOutput
HOST.NAME=\u30DB\u30B9\u30C8
LONG_NAME=\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0\u3057\u307E\u3059
LONG_NAME=\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059
NB_LINE.NAME=\u884C\u6570
PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
@@ -45,13 +45,13 @@ SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
STANDARD_SYNTAX.NAME=\u6A19\u6E96SQL\u69CB\u6587\u3092\u751F\u6210
TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
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\u306E\u64CD\u4F5C
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
USE_COMMIT_CONTROL.NAME=\u30B3\u30DF\u30C3\u30C8\u5236\u5FA1\u3092\u4F7F\u3046
USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
@@ -60,7 +60,7 @@ ENABLE_DEBUG_MODE.NAME=\u30C7\u30D0\u30C3\u30B0\u30AF\u30A8\u30EA\u30FC\u30E2\u3
DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
DB_VERSION.ITEM.V6R1_V7R2=V6R1\u304B\u3089V7R2
DB_VERSION.ITEM.V7R1_V7R3=V7R1\u304B\u3089V7R3
NB_LINE_UPDATED.NAME=NB\u884C\u66F4\u65B0\u6E08\u307F
NB_LINE_UPDATED.NAME=NB\u884C\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6E08\u307F
NB_LINE_INSERTED.NAME=NB\u884C\u633F\u5165\u6E08\u307F
NB_LINE_DELETED.NAME=NB\u884C\u524A\u9664\u6E08\u307F
PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7

View File

@@ -8,15 +8,15 @@ NULL_CHAR.NAME=Null\u6587\u5B57
PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u306E\u64CD\u4F5C
TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u306E\u5207\u308A\u6368\u3066
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
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\u3078\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DATA_ACTION.ITEM.INSERT=\u633F\u5165
PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7
MAPPING.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0

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

@@ -11,15 +11,15 @@ CLEAR_TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF\u306E\u30AF\u30EA\u3
COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
DATA_ACTION.ITEM.DELETE=\u524A\u9664
DATA_ACTION.ITEM.INSERT=\u633F\u5165
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3078\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DBNAME.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u4E86
ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
HELP=org.talend.help.tAccessOutput
LONG_NAME=Access\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0\u3057\u307E\u3059\u3002
LONG_NAME=Access\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u3002
PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
QUERY.NAME=\u30AF\u30A8\u30EA\u30FC
REJECT.LINK=\u30EA\u30B8\u30A7\u30AF\u30C8
@@ -28,13 +28,13 @@ SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
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
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u306E\u64CD\u4F5C
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
ADD_COLS.ITEM.OPERATOR=\u6F14\u7B97\u5B50
ADD_COLS.ITEM.OPERATOR.ITEM.EQUAL=\\=
ADD_COLS.ITEM.OPERATOR.ITEM.NOT_EQUAL=<>
@@ -46,13 +46,13 @@ ADD_COLS.ITEM.OPERATOR.ITEM.IS=IS
ADD_COLS.ITEM.OPERATOR.ITEM.IS_NOT=IS NOT
USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528
FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3
FIELD_OPTIONS.ITEM.UPDATE_KEY=\u66F4\u65B0\u30AD\u30FC
FIELD_OPTIONS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30AD\u30FC
FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u30AD\u30FC
FIELD_OPTIONS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
FIELD_OPTIONS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
FIELD_OPTIONS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
ENABLE_DEBUG_MODE.NAME=\u30C7\u30D0\u30C3\u30B0\u30AF\u30A8\u30EA\u30FC\u30E2\u30FC\u30C9
NB_LINE.NAME=\u884C\u6570
NB_LINE_UPDATED.NAME=NB\u884C\u66F4\u65B0\u6E08\u307F
NB_LINE_UPDATED.NAME=NB\u884C\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6E08\u307F
NB_LINE_INSERTED.NAME=NB\u884C\u633F\u5165\u6E08\u307F
NB_LINE_DELETED.NAME=NB\u884C\u524A\u9664\u6E08\u307F
NB_LINE_REJECTED.NAME=\u30EA\u30B8\u30A7\u30AF\u30C8\u3055\u308C\u305F\u884C\u6570

View File

@@ -11,13 +11,13 @@ RUN_IF.LINK=If
RUN_IF.MENU=Run if
SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
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\u306E\u64CD\u4F5C
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
CODE_PAGE.NAME=\u30B3\u30FC\u30C9\u30DA\u30FC\u30B8
PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7
@@ -27,7 +27,7 @@ ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
DB_VERSION.ITEM.Access_2003=Access 2003
DB_VERSION.ITEM.Access_2007=Access 2007
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3078\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DATA_ACTION.ITEM.INSERT=\u633F\u5165
CREATE.NAME=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u3092\u4F5C\u6210
PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC

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

@@ -1,4 +1,4 @@
ADVANCED_SEPARATOR.NAME=\u9AD8\u5EA6\u306A\u533A\u5207\u308A\u8A18\u53F7(\u6570\u5B57\u7528)
ADVANCED_SEPARATOR.NAME=\u9AD8\u5EA6\u306A\u533A\u5207\u308A(\u6570\u5B57\u7528)
CREATE.NAME=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u3001\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u3092\u4F5C\u6210
CREATE_EMPTY_ELEMENT.NAME=\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u7A7A\u306E\u30A8\u30EC\u30E1\u30F3\u30C8\u3092\u4F5C\u6210
ADD_EMPTY_ATTRIBUTE.NAME=\u5024\u304CNULL\u306E\u5834\u5408\u3067\u3082\u5C5E\u6027\u3092\u4F5C\u6210
@@ -8,7 +8,7 @@ DELETE_EMPTYFILE.NAME=\u7A7A\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u30
ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
FIELD_TAG.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30BF\u30B0
FILENAME.NAME=\u30D5\u30A1\u30A4\u30EB\u540D
GENERATION_MODE.ITEM.DOM4J=\u4F4E\u901F\u3067\u30E1\u30E2\u30EA\u3092\u6D88\u8CBB (Dom4J)
GENERATION_MODE.ITEM.DOM4J=\u4F4E\u901F\u3067\u30E1\u30E2\u30EA\u3092\u6D88\u8CBB(Dom4J)
GENERATION_MODE.ITEM.NULL=\u9AD8\u901F\u3067\u30E1\u30E2\u30EA\u6D88\u8CBB\u5C11
GENERATION_MODE.NAME=\u751F\u6210\u30E2\u30FC\u30C9
GROUP.ITEM.ATTRIBUTE=\u5C5E\u6027

View File

@@ -51,7 +51,7 @@
<IMPORT NAME="Jboss_Marshalling" MODULE="jboss-marshalling-2.0.12.Final.jar" MVN="mvn:org.jboss.marshalling/jboss-marshalling/2.0.12.Final" REQUIRED="true"/>
<IMPORT NAME="Jboss_River" MODULE="jboss-marshalling-river-2.0.12.Final.jar" MVN="mvn:org.jboss.marshalling/jboss-marshalling-river/2.0.12.Final" REQUIRED="true"/>
<IMPORT NAME="Trove" MODULE="trove.jar" MVN="mvn:org.talend.libraries/trove/6.0.0" REQUIRED="true"/>
<IMPORT NAME="Log4j" MODULE="log4j-1.2.17.jar" MVN="mvn:log4j/log4j/1.2.17" UrlPath="platform:/plugin/org.talend.libraries.apache/lib/log4j-1.2.17.jar" REQUIRED="true" BundleID=""/>
<IMPORT NAME="reload4j-1.2.19" MODULE="reload4j-1.2.19.jar" MVN="mvn:ch.qos.reload4j/reload4j/1.2.19" REQUIRED="true" BundleID=""/>
</IMPORTS>
</CODEGENERATION>

View File

@@ -63,8 +63,8 @@
REQUIRED="true"
/>
<IMPORT
NAME="Log4j"
MODULE="log4j-1.2.17.jar" MVN="mvn:log4j/log4j/1.2.17" UrlPath="platform:/plugin/org.talend.libraries.apache/lib/log4j-1.2.17.jar"
NAME="reload4j-1.2.19"
MODULE="reload4j-1.2.19.jar" MVN="mvn:ch.qos.reload4j/reload4j/1.2.19"
REQUIRED="true"
BundleID=""
/>

View File

@@ -3,7 +3,7 @@ GROUPBYS.ITEM.INPUT_COLUMN=\u5165\u529B\u30AB\u30E9\u30E0\u4F4D\u7F6E
GROUPBYS.ITEM.OUTPUT_COLUMN=\u51FA\u529B\u30AB\u30E9\u30E0
GROUPBYS.NAME=\u5206\u985E\u57FA\u6E96:
HELP=org.talend.help.tAggregateRowOptOut
LIST_DELIMITER.NAME=\u533A\u5207\u308A\u8A18\u53F7(\u30EA\u30B9\u30C8\u64CD\u4F5C\u5C02\u7528)
LIST_DELIMITER.NAME=\u533A\u5207\u308A(\u30EA\u30B9\u30C8\u64CD\u4F5C\u5C02\u7528)
USE_FINANCIAL_PRECISION.NAME=\u91D1\u878D\u8A08\u7B97\u7CBE\u5EA6\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\u3053\u308C\u306F""sum""\u64CD\u4F5C\u3068""avg""\u64CD\u4F5C\u306E\u6700\u5927\u7CBE\u5EA6\u3067\u3059\u3002\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u30AA\u30F3\u306B\u3059\u308B\u3068\u3001\u30AA\u30D5\u306B\u3057\u305F\u5834\u5408\u3068\u6BD4\u3079\u3066\u30D2\u30FC\u30D7\u30E1\u30E2\u30EA\u304C\u5897\u3057\u3001\u51E6\u7406\u304C\u9045\u304F\u306A\u308A\u307E\u3059\u3002
CHECK_TYPE_OVERFLOW.NAME=\u30AA\u30FC\u30D0\u30FC\u30D5\u30ED\u30FC\u30C1\u30A7\u30C3\u30AF\uFF08\u9045\u3044\uFF09
CHECK_ULP.NAME=ULP\uFF08Unit in the Last Place\uFF09\u3092\u30C1\u30A7\u30C3\u30AF\u3057\u3066\u3001\u5024\u304C\u5897\u52A0\u3059\u308B\u304B\u6E1B\u5C11\u3059\u308B\u304B\u3092\u6B63\u3057\u304F\u4FDD\u8A3C\u3059\u308B\u3001fload\u578B\u3068double\u578B\u306E\u307F\u5BFE\u5FDC\u3002(\u3088\u308A\u9045\u3044)

View File

@@ -3,7 +3,7 @@ GROUPBYS.ITEM.INPUT_COLUMN=\u5165\u529B\u30AB\u30E9\u30E0\u4F4D\u7F6E
GROUPBYS.ITEM.OUTPUT_COLUMN=\u51FA\u529B\u30AB\u30E9\u30E0
GROUPBYS.NAME=\u5206\u985E\u57FA\u6E96:
HELP=org.talend.help.tAggregateOut
LIST_DELIMITER.NAME=\u533A\u5207\u308A\u8A18\u53F7(\u30EA\u30B9\u30C8\u64CD\u4F5C\u5C02\u7528)
LIST_DELIMITER.NAME=\u533A\u5207\u308A(\u30EA\u30B9\u30C8\u64CD\u4F5C\u5C02\u7528)
USE_FINANCIAL_PRECISION.NAME=\u91D1\u878D\u8A08\u7B97\u7CBE\u5EA6\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\u3053\u308C\u306F""sum""\u64CD\u4F5C\u3068""avg""\u64CD\u4F5C\u306E\u6700\u5927\u7CBE\u5EA6\u3067\u3059\u3002\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u30AA\u30F3\u306B\u3059\u308B\u3068\u3001\u30AA\u30D5\u306B\u3057\u305F\u5834\u5408\u3068\u6BD4\u3079\u3066\u30D2\u30FC\u30D7\u30E1\u30E2\u30EA\u304C\u5897\u3057\u3001\u51E6\u7406\u304C\u9045\u304F\u306A\u308A\u307E\u3059\u3002
CHECK_TYPE_OVERFLOW.NAME=\u30AA\u30FC\u30D0\u30FC\u30D5\u30ED\u30FC\u30C1\u30A7\u30C3\u30AF\uFF08\u9045\u3044\uFF09
CHECK_ULP.NAME=ULP\uFF08Unit in the Last Place\uFF09\u3092\u30C1\u30A7\u30C3\u30AF\u3057\u3066\u3001\u5024\u304C\u5897\u52A0\u3059\u308B\u304B\u6E1B\u5C11\u3059\u308B\u304B\u3092\u6B63\u3057\u304F\u4FDD\u8A3C\u3059\u308B\u3001fload\u578B\u3068double\u578B\u306E\u307F\u5BFE\u5FDC\u3002(\u3088\u308A\u9045\u3044)

View File

@@ -3,7 +3,7 @@ GROUPBYS.ITEM.INPUT_COLUMN=\u5165\u529B\u30AB\u30E9\u30E0\u4F4D\u7F6E
GROUPBYS.ITEM.OUTPUT_COLUMN=\u51FA\u529B\u30AB\u30E9\u30E0
GROUPBYS.NAME=\u5206\u985E\u57FA\u6E96:
HELP=org.talend.help.tAggregateRow
LIST_DELIMITER.NAME=\u533A\u5207\u308A\u8A18\u53F7(\u30EA\u30B9\u30C8\u64CD\u4F5C\u5C02\u7528)
LIST_DELIMITER.NAME=\u533A\u5207\u308A(\u30EA\u30B9\u30C8\u64CD\u4F5C\u5C02\u7528)
USE_FINANCIAL_PRECISION.NAME=\u91D1\u878D\u8A08\u7B97\u7CBE\u5EA6\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\u3053\u308C\u306F""sum""\u64CD\u4F5C\u3068""avg""\u64CD\u4F5C\u306E\u6700\u5927\u7CBE\u5EA6\u3067\u3059\u3002\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u30AA\u30F3\u306B\u3059\u308B\u3068\u3001\u30AA\u30D5\u306B\u3057\u305F\u5834\u5408\u3068\u6BD4\u3079\u3066\u30D2\u30FC\u30D7\u30E1\u30E2\u30EA\u304C\u5897\u3057\u3001\u51E6\u7406\u304C\u9045\u304F\u306A\u308A\u307E\u3059\u3002
CHECK_TYPE_OVERFLOW.NAME=\u30AA\u30FC\u30D0\u30FC\u30D5\u30ED\u30FC\u30C1\u30A7\u30C3\u30AF\uFF08\u9045\u3044\uFF09
CHECK_ULP.NAME=ULP\uFF08Unit in the Last Place\uFF09\u3092\u30C1\u30A7\u30C3\u30AF\u3057\u3066\u3001\u5024\u304C\u5897\u52A0\u3059\u308B\u304B\u6E1B\u5C11\u3059\u308B\u304B\u3092\u6B63\u3057\u304F\u4FDD\u8A3C\u3059\u308B\u3001fload\u578B\u3068double\u578B\u306E\u307F\u5BFE\u5FDC\u3002(\u3088\u308A\u9045\u3044)

View File

@@ -15,29 +15,29 @@ ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=>
ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=>\\=
ADD_COLS.ITEM.OPERATOR.ITEM.IS=IS
ADD_COLS.ITEM.OPERATOR.ITEM.IS_NOT=IS NOT
ADD_COLS.ITEM.UPDATE_KEY=\u66F4\u65B0\u306E\u5165\u529B
ADD_COLS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306E\u5165\u529B
ADD_COLS.ITEM.DELETE_KEY=\u524A\u9664\u306E\u5165\u529B
ADD_COLS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
ADD_COLS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
ADD_COLS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
ADD_COLS.NAME=\u8FFD\u52A0\u30AB\u30E9\u30E0
CLEAR_TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF\u306E\u30AF\u30EA\u30A2
COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
DATA_ACTION.ITEM.REPLACE=\u7F6E\u63DB
DATA_ACTION.ITEM.INSERT_ON_DUPLICATE_KEY_UPDATE=\u91CD\u8907\u3059\u308B\u30AD\u30FC\u304B\u30E6\u30CB\u30FC\u30AF\u306A\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u633F\u5165\u304B\u66F4\u65B0
DATA_ACTION.ITEM.INSERT_ON_DUPLICATE_KEY_UPDATE=\u91CD\u8907\u3059\u308B\u30AD\u30FC\u304B\u30E6\u30CB\u30FC\u30AF\u306A\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u633F\u5165\u304B\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.DELETE=\u524A\u9664
DATA_ACTION.ITEM.INSERT=\u633F\u5165
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.ITEM.INSERT_IGNORE=\u633F\u5165\u3001\u7121\u8996
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3078\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DBNAME.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u4E86
ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
EXTENDINSERT.NAME=\u633F\u5165\u306E\u62E1\u5F35
HELP=org.talend.help.tAmazonRDSAuroraOutput
HOST.NAME=\u30DB\u30B9\u30C8
LONG_NAME=Amazon RDS Aurora\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u3059\u308B\u304B\u3001\u307E\u305F\u306F\u884C\u3092\u66F4\u65B0\u3057\u307E\u3059
LONG_NAME=Amazon RDS Aurora\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u3059\u308B\u304B\u3001\u307E\u305F\u306F\u884C\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059
NB_LINE.NAME=\u884C\u6570
PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
PORT.NAME=\u30DD\u30FC\u30C8
@@ -47,14 +47,14 @@ REJECT.MENU=\u30EA\u30B8\u30A7\u30AF\u30C8
SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u306E\u5207\u308A\u6368\u3066
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\u306E\u64CD\u4F5C
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc\u30C9\u30E9\u30A4\u30D0\u30FC)
TYPE.ITEM.MYSQL=MySQL
TYPE.ITEM.ODBC=\u6C4E\u7528ODBC
@@ -67,16 +67,16 @@ USE_EXTENDED_INSERTS.NAME=\u62E1\u5F35\u633F\u5165\u306E\u4F7F\u7528
NB_ROWS_PER_INSERT.NAME=\u30A4\u30F3\u30B5\u30FC\u30C8\u6BCE\u306E\u884C\u6570
USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528
FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3
FIELD_OPTIONS.ITEM.UPDATE_KEY=\u66F4\u65B0\u306E\u5165\u529B
FIELD_OPTIONS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306E\u5165\u529B
FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u306E\u5165\u529B
FIELD_OPTIONS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
FIELD_OPTIONS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
FIELD_OPTIONS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
ENABLE_DEBUG_MODE.NAME=\u30C7\u30D0\u30C3\u30B0\u30AF\u30A8\u30EA\u30FC\u30E2\u30FC\u30C9
NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
ON_DUPLICATE_KEY_UPDATE.NAME=\u633F\u5165\u6642\u3001\u30AD\u30FC\u304C\u91CD\u8907\u3057\u305F\u3089\u66F4\u65B0\u30E2\u30FC\u30C9\u3092\u4F7F\u7528
ON_DUPLICATE_KEY_UPDATE.NAME=\u633F\u5165\u6642\u3001\u30AD\u30FC\u304C\u91CD\u8907\u3057\u305F\u3089\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30E2\u30FC\u30C9\u3092\u4F7F\u7528
DUPLICATED_KEYS.NAME=
DUPLICATED_KEYS.ITEM.DUPLICATED_KEY=\u30AB\u30E9\u30E0
DUPLICATED_KEYS.ITEM.DUPLICATED_VALUE=\u5024

View File

@@ -228,17 +228,17 @@
<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.11.4.jar" MODULE="jackson-core-2.11.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4"
<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"
REQUIRED="true" />
<IMPORT NAME="jackson-databind-2.11.4.jar" MODULE="jackson-databind-2.11.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4"
<IMPORT NAME="jackson-databind-2.13.2.2.jar" MODULE="jackson-databind-2.13.2.2.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
REQUIRED="true" />
<IMPORT NAME="jackson-annotations-2.11.4.jar" MODULE="jackson-annotations-2.11.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4"
<IMPORT NAME="jackson-annotations-2.13.2.jar" MODULE="jackson-annotations-2.13.2.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
REQUIRED="true" />
<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"

View File

@@ -555,17 +555,17 @@
<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.11.4.jar" MODULE="jackson-core-2.11.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4"
<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"
REQUIRED="true" />
<IMPORT NAME="jackson-databind-2.11.4.jar" MODULE="jackson-databind-2.11.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4"
<IMPORT NAME="jackson-databind-2.13.2.2.jar" MODULE="jackson-databind-2.13.2.2.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
REQUIRED="true" />
<IMPORT NAME="jackson-annotations-2.11.4.jar" MODULE="jackson-annotations-2.11.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4"
<IMPORT NAME="jackson-annotations-2.13.2.jar" MODULE="jackson-annotations-2.13.2.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
REQUIRED="true" />
<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"

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,17 +285,17 @@
<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.11.4.jar" MODULE="jackson-core-2.11.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4"
<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"
REQUIRED="true" />
<IMPORT NAME="jackson-databind-2.11.4.jar" MODULE="jackson-databind-2.11.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4"
<IMPORT NAME="jackson-databind-2.13.2.2.jar" MODULE="jackson-databind-2.13.2.2.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
REQUIRED="true" />
<IMPORT NAME="jackson-annotations-2.11.4.jar" MODULE="jackson-annotations-2.11.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4"
<IMPORT NAME="jackson-annotations-2.13.2.jar" MODULE="jackson-annotations-2.13.2.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
REQUIRED="true" />
<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"

View File

@@ -10,10 +10,10 @@ CLEAR_TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF\u306E\u30AF\u30EA\u3
COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
DATA_ACTION.ITEM.DELETE=\u524A\u9664
DATA_ACTION.ITEM.INSERT=\u633F\u5165
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3078\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
DBD-Pg.INFO=PostgreSQL\u3067\u5FC5\u9808
@@ -32,12 +32,12 @@ SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
SQL_SYNTAX.NAME=Sql\u69CB\u6587
STRING_QUOTE.NAME=\u5F15\u7528\u7B26
TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
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.NONE=\u306A\u3057
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u306E\u64CD\u4F5C
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc\u30C9\u30E9\u30A4\u30D0\u30FC)
TYPE.ITEM.MYSQL=MySQL
TYPE.ITEM.ODBC=\u6C4E\u7528ODBC

View File

@@ -15,22 +15,22 @@ ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=>
ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=>\\=
ADD_COLS.ITEM.OPERATOR.ITEM.IS=IS
ADD_COLS.ITEM.OPERATOR.ITEM.IS_NOT=IS NOT
ADD_COLS.ITEM.UPDATE_KEY=\u66F4\u65B0\u306E\u5165\u529B
ADD_COLS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306E\u5165\u529B
ADD_COLS.ITEM.DELETE_KEY=\u524A\u9664\u306E\u5165\u529B
ADD_COLS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
ADD_COLS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
ADD_COLS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
ADD_COLS.NAME=\u8FFD\u52A0\u30AB\u30E9\u30E0
CLEAR_TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF\u306E\u30AF\u30EA\u30A2
COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
DATA_ACTION.ITEM.REPLACE=\u7F6E\u63DB
DATA_ACTION.ITEM.INSERT_ON_DUPLICATE_KEY_UPDATE=\u91CD\u8907\u3059\u308B\u30AD\u30FC\u304B\u30E6\u30CB\u30FC\u30AF\u306A\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u633F\u5165\u304B\u66F4\u65B0
DATA_ACTION.ITEM.INSERT_ON_DUPLICATE_KEY_UPDATE=\u91CD\u8907\u3059\u308B\u30AD\u30FC\u304B\u30E6\u30CB\u30FC\u30AF\u306A\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u633F\u5165\u304B\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.DELETE=\u524A\u9664
DATA_ACTION.ITEM.INSERT=\u633F\u5165
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.ITEM.INSERT_IGNORE=\u633F\u5165\u3001\u7121\u8996
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3078\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
DBD-Pg.INFO=PostgreSQL\u3067\u5FC5\u9808
@@ -41,7 +41,7 @@ ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
EXTENDINSERT.NAME=\u633F\u5165\u306E\u62E1\u5F35
HELP=org.talend.help.tAmazonMysqlOutput
HOST.NAME=\u30DB\u30B9\u30C8
LONG_NAME=Amazon RDS MySQL\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0\u3057\u307E\u3059\u3002
LONG_NAME=Amazon RDS MySQL\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u3002
NB_LINE.NAME=\u884C\u6570
NULL_CHAR.NAME=Null\u6587\u5B57
PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
@@ -54,14 +54,14 @@ SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
SQL_SYNTAX.NAME=Sql\u69CB\u6587
STRING_QUOTE.NAME=\u5F15\u7528\u7B26
TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u306E\u5207\u308A\u6368\u3066
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\u306E\u64CD\u4F5C
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc\u30C9\u30E9\u30A4\u30D0\u30FC)
TYPE.ITEM.MYSQL=MySQL
TYPE.ITEM.ODBC=\u6C4E\u7528ODBC
@@ -74,16 +74,16 @@ USE_EXTENDED_INSERTS.NAME=\u62E1\u5F35\u633F\u5165\u306E\u4F7F\u7528
NB_ROWS_PER_INSERT.NAME=\u30A4\u30F3\u30B5\u30FC\u30C8\u6BCE\u306E\u884C\u6570
USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528
FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3
FIELD_OPTIONS.ITEM.UPDATE_KEY=\u66F4\u65B0\u306E\u5165\u529B
FIELD_OPTIONS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306E\u5165\u529B
FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u306E\u5165\u529B
FIELD_OPTIONS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
FIELD_OPTIONS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
FIELD_OPTIONS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
ENABLE_DEBUG_MODE.NAME=\u30C7\u30D0\u30C3\u30B0\u30AF\u30A8\u30EA\u30FC\u30E2\u30FC\u30C9
NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
ON_DUPLICATE_KEY_UPDATE.NAME=\u633F\u5165\u6642\u3001\u30AD\u30FC\u304C\u91CD\u8907\u3057\u305F\u3089\u66F4\u65B0\u30E2\u30FC\u30C9\u3092\u4F7F\u7528
ON_DUPLICATE_KEY_UPDATE.NAME=\u633F\u5165\u6642\u3001\u30AD\u30FC\u304C\u91CD\u8907\u3057\u305F\u3089\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30E2\u30FC\u30C9\u3092\u4F7F\u7528
DUPLICATED_KEYS.NAME=
DUPLICATED_KEYS.ITEM.DUPLICATED_KEY=\u30AB\u30E9\u30E0
DUPLICATED_KEYS.ITEM.DUPLICATED_VALUE=\u5024

View File

@@ -10,10 +10,10 @@ CLEAR_TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF\u306E\u30AF\u30EA\u3
COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
DATA_ACTION.ITEM.DELETE=\u524A\u9664
DATA_ACTION.ITEM.INSERT=\u633F\u5165
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3078\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
DBD-Pg.INFO=PostgreSQL\u3067\u5FC5\u9808
@@ -32,12 +32,12 @@ SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
SQL_SYNTAX.NAME=Sql\u69CB\u6587
STRING_QUOTE.NAME=\u5F15\u7528\u7B26
TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
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.NONE=\u306A\u3057
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u306E\u64CD\u4F5C
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc\u30C9\u30E9\u30A4\u30D0\u30FC)
TYPE.ITEM.MYSQL=MySQL
TYPE.ITEM.ODBC=\u6C4E\u7528ODBC

View File

@@ -10,10 +10,10 @@ CLEAR_TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF\u306E\u30AF\u30EA\u3
COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
DATA_ACTION.ITEM.DELETE=\u524A\u9664
DATA_ACTION.ITEM.INSERT=\u633F\u5165
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3078\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
DBD-Pg.INFO=PostgreSQL\u3067\u5FC5\u9808
@@ -32,12 +32,12 @@ SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
SQL_SYNTAX.NAME=Sql\u69CB\u6587
STRING_QUOTE.NAME=\u5F15\u7528\u7B26
TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
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.NONE=\u306A\u3057
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u306E\u64CD\u4F5C
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc\u30C9\u30E9\u30A4\u30D0\u30FC)
TYPE.ITEM.MYSQL=MySQL
TYPE.ITEM.ODBC=\u6C4E\u7528ODBC

View File

@@ -8,7 +8,7 @@ PORT.NAME=\u30DD\u30FC\u30C8
SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
SCHEMA_DB.NAME=\u30B9\u30AD\u30FC\u30DE
USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
PRINT_ERROR.NAME=\u5370\u5237\u30A8\u30E9\u30FC("\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0"\u3068\u306E\u9593\u306B\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093)
PRINT_ERROR.NAME=\u5370\u5237\u30A8\u30E9\u30FC("\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8"\u3068\u306E\u9593\u306B\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093)
DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
CONNECTION_TYPE.ITEM.ORACLE_SID=Oracle SID
CONNECTION_TYPE.NAME=\u63A5\u7D9A\u30BF\u30A4\u30D7

View File

@@ -22,10 +22,10 @@ CONNECTION_TYPE.ITEM.ORACLE_SID=Oracle SID
CONNECTION_TYPE.NAME=\u63A5\u7D9A\u30BF\u30A4\u30D7
DATA_ACTION.ITEM.DELETE=\u524A\u9664
DATA_ACTION.ITEM.INSERT=\u633F\u5165
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3078\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
DBD-Pg.INFO=PostgreSQL\u3067\u5FC5\u9808
@@ -35,7 +35,7 @@ DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u
ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
HELP=org.talend.help.tAmazonOracleOutput
HOST.NAME=\u30DB\u30B9\u30C8
LONG_NAME=Amazon RDS Oracle\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0\u3057\u307E\u3059\u3002
LONG_NAME=Amazon RDS Oracle\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u3002
NB_LINE.NAME=\u884C\u6570
NULL_CHAR.NAME=Null\u6587\u5B57
PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
@@ -48,14 +48,14 @@ SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
SQL_SYNTAX.NAME=Sql\u69CB\u6587
STRING_QUOTE.NAME=\u5F15\u7528\u7B26
TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u306E\u5207\u308A\u6368\u3066
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\u306E\u64CD\u4F5C
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc\u30C9\u30E9\u30A4\u30D0\u30FC)
TYPE.ITEM.MYSQL=MySQL
TYPE.ITEM.ODBC=\u6C4E\u7528ODBC
@@ -69,9 +69,9 @@ SCHEMA_DB.NAME=Oracle\u30B9\u30AD\u30FC\u30DE
TABLESCHEMA.NAME=Oracle\u30B9\u30AD\u30FC\u30DE
USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528
FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3
FIELD_OPTIONS.ITEM.UPDATE_KEY=\u66F4\u65B0\u306E\u5165\u529B
FIELD_OPTIONS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306E\u5165\u529B
FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u306E\u5165\u529B
FIELD_OPTIONS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
FIELD_OPTIONS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
FIELD_OPTIONS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
LOCAL_SERVICE_NAME.NAME=\u30ED\u30FC\u30AB\u30EB\u30B5\u30FC\u30D3\u30B9\u540D
CONVERT_COLUMN_TABLE_TO_UPPERCASE.NAME=\u30AB\u30E9\u30E0\u3068\u30C6\u30FC\u30D6\u30EB\u3092\u5927\u6587\u5B57\u306B\u5909\u63DB
@@ -84,7 +84,7 @@ DB_VERSION.ITEM.ORACLE_10=Oracle 10
DB_VERSION.ITEM.ORACLE_9=Oracle 9
DB_VERSION.ITEM.ORACLE_8=Oracle 8
OVERRIDE_NLS_LANG.NAME=\u65E2\u5B58\u306ENLS_LANG\u74B0\u5883\u5909\u6570\u3092\u4E0A\u66F8\u304D
NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
USE_BATCH_SIZE.NAME=\u30D0\u30C3\u30C1\u30B5\u30A4\u30BA\u3092\u4F7F\u7528

View File

@@ -69,8 +69,8 @@ PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
USE_NB_LINE.NAME=NB_LINE_\u306E\u4F7F\u7528
USE_NB_LINE.ITEM.NONE=\u306A\u3057
USE_NB_LINE.ITEM.NB_LINE_INSERTED=\u633F\u5165\u6E08\u307F
USE_NB_LINE.ITEM.NB_LINE_UPDATED=\u66F4\u65B0\u6E08\u307F
USE_NB_LINE.ITEM.NB_LINE_UPDATED=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6E08\u307F
USE_NB_LINE.ITEM.NB_LINE_DELETED=\u524A\u9664\u6E08\u307F
NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570

View File

@@ -345,17 +345,17 @@
<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.11.4.jar" MODULE="jackson-core-2.11.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4"
<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"
REQUIRED="true" />
<IMPORT NAME="jackson-databind-2.11.4.jar" MODULE="jackson-databind-2.11.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4"
<IMPORT NAME="jackson-databind-2.13.2.2.jar" MODULE="jackson-databind-2.13.2.2.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
REQUIRED="true" />
<IMPORT NAME="jackson-annotations-2.11.4.jar" MODULE="jackson-annotations-2.11.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4"
<IMPORT NAME="jackson-annotations-2.13.2.jar" MODULE="jackson-annotations-2.13.2.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
REQUIRED="true" />
<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"

View File

@@ -383,9 +383,9 @@
<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
<!--Active directory dependency module: msal4j and transitive -->
<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
@@ -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

@@ -40,11 +40,11 @@ DW_TABLE_PROPERTIES.NAME=Synapse Analytics\u30C6\u30FC\u30D6\u30EB\u30D7\u30ED\u
ENABLE_SSL.NAME=\u5B89\u5168\u306A\u8EE2\u9001\u304C\u5FC5\u8981
ENDPOINT.NAME=OAuth 2.0\u30C8\u30FC\u30AF\u30F3\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8
EXT_TABLE_OPTIONS.NAME=\u30C7\u30FC\u30BF\u30A4\u30F3\u30DD\u30FC\u30C8\u30EA\u30B8\u30A7\u30AF\u30C8\u30AA\u30D7\u30B7\u30E7\u30F3
FIELDSEPARATOR.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A\u8A18\u53F7
FIELDSEPARATOR.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A
FILENAME.NAME=\u30ED\u30FC\u30AB\u30EB\u306E\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9
HELP=org.talend.help.tAzureSynapseBulkExec
HOST.NAME=\u30DB\u30B9\u30C8
IMPORT_TYPE.ITEM.DELIMITED_TEXT=\u533A\u5207\u308A\u8A18\u53F7\u4ED8\u304D\u30C6\u30AD\u30B9\u30C8
IMPORT_TYPE.ITEM.DELIMITED_TEXT=\u533A\u5207\u308A\u4ED8\u304D\u30C6\u30AD\u30B9\u30C8
IMPORT_TYPE.ITEM.HIVE_ORC=Hive ORC
IMPORT_TYPE.ITEM.HIVE_RCFILE=Hive RCFile
IMPORT_TYPE.ITEM.PARQUET=Parquet
@@ -83,14 +83,14 @@ SQL_SYNTAX.NAME=Sql\u69CB\u6587
STRINGDELIMITER.NAME=
STRING_QUOTE.NAME=\u5F15\u7528\u7B26
TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
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\u306E\u5207\u308A\u6368\u3066
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u306E\u64CD\u4F5C
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
TABLE_OPTION.ITEM.CLUSTERED_COLUMNSTORE_INDEX=\u30AF\u30E9\u30B9\u30BF\u30FC\u5316\u3055\u308C\u305F\u30AB\u30E9\u30E0\u30B9\u30C8\u30A2\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
TABLE_OPTION.ITEM.CLUSTERED_INDEX=\u30AF\u30E9\u30B9\u30BF\u30FC\u5316\u3055\u308C\u305F\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
TABLE_OPTION.ITEM.HEAP=\u30D2\u30FC\u30D7
@@ -123,8 +123,8 @@ FILE_TYPE.ITEM.ORC=ORC
FILE_TYPE.ITEM.PARQUET=PARQUET
FIRST_ROW.NAME=\u5148\u982D\u884C
FIELD_QUOTE.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AF\u30A9\u30FC\u30C8
FIELD_TERMINATOR.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A\u8A18\u53F7
ROW_TERMINATOR.NAME=\u884C\u533A\u5207\u308A\u8A18\u53F7
FIELD_TERMINATOR.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A
ROW_TERMINATOR.NAME=\u884C\u533A\u5207\u308A
COPY_CSV_DATE_FORMAT.NAME=\u65E5\u4ED8\u5F62\u5F0F
COPY_CSV_DATE_FORMAT.ITEM.SESSION_DATEFORMAT=\u30BB\u30C3\u30B7\u30E7\u30F3\u65E5\u4ED8\u5F62\u5F0F
COPY_CSV_DATE_FORMAT.ITEM.MDY=mdy

View File

@@ -206,9 +206,9 @@
<IMPORT NAME="slf4j-log4j12-1.7.29.jar" MODULE="slf4j-log4j12-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.29" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
<!--Active directory dependency module: msal4j and transitive -->
<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
@@ -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

@@ -266,9 +266,9 @@
<IMPORT NAME="Talend_MssqlUtil" MODULE="talend_DB_mssqlUtil-1.4.jar" MVN="mvn:org.talend.components.lib/talend_DB_mssqlUtil/1.4" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend_DB_mssqlUtil-1.4.jar" REQUIRED="true" />
<!--Active directory dependency module: msal4j and transitive -->
<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
@@ -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

@@ -337,9 +337,9 @@
<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
<!--Active directory dependency module: msal4j and transitive -->
<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
@@ -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

@@ -21,11 +21,11 @@ COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
DATA_ACTION.ITEM.DELETE=\u524A\u9664
DATA_ACTION.ITEM.INSERT=\u633F\u5165
DATA_ACTION.ITEM.SINGLE_INSERT=\u5358\u4E00\u633F\u5165\u30AF\u30A8\u30EA\u30FC
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
DATA_ACTION.ITEM.INSERT_IF_NOT_EXIST=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u633F\u5165
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3078\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
DBD-Pg.INFO=PostgreSQL\u3067\u5FC5\u9808
@@ -38,14 +38,14 @@ DSN.NAME=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9
ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u306E\u5165\u529B
FIELD_OPTIONS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
FIELD_OPTIONS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
FIELD_OPTIONS.ITEM.UPDATE_KEY=\u66F4\u65B0\u306E\u5165\u529B
FIELD_OPTIONS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
FIELD_OPTIONS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306E\u5165\u529B
FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3
HELP=org.talend.help.tAzureSynapseOutput
HOST.NAME=\u30DB\u30B9\u30C8
IDENTITY_INSERT.NAME=ID\u633F\u5165\u3092\u30AA\u30F3\u306B\u3059\u308B
INSTANCE.NAME=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9
LONG_NAME=MSSQL\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u3059\u308B\u304B\u3001\u307E\u305F\u306F\u884C\u3092\u66F4\u65B0\u3057\u307E\u3059
LONG_NAME=MSSQL\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u3059\u308B\u304B\u3001\u307E\u305F\u306F\u884C\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059
NB_LINE.NAME=\u884C\u6570
NULL_CHAR.NAME=Null\u6587\u5B57
PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
@@ -59,14 +59,14 @@ SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
SQL_SYNTAX.NAME=Sql\u69CB\u6587
STRING_QUOTE.NAME=\u5F15\u7528\u7B26
TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u306E\u5207\u308A\u6368\u3066
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_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\u306E\u64CD\u4F5C
TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528
@@ -75,7 +75,7 @@ SPECIFY_IDENTITY_FIELD.NAME=ID\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u6307\u5B9A
IDENTITY_FIELD.NAME=ID\u30D5\u30A3\u30FC\u30EB\u30C9
START_VALUE.NAME=\u958B\u59CB\u5024
STEP.NAME=\u30B9\u30C6\u30C3\u30D7
NB_LINE_UPDATED.NAME=NB\u884C\u66F4\u65B0\u6E08\u307F
NB_LINE_UPDATED.NAME=NB\u884C\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6E08\u307F
NB_LINE_INSERTED.NAME=NB\u884C\u633F\u5165\u6E08\u307F
NB_LINE_DELETED.NAME=NB\u884C\u524A\u9664\u6E08\u307F
SUPPORT_NULL_WHERE.NAME="SQL WHERE"\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u3067Null\u3092\u30B5\u30DD\u30FC\u30C8

View File

@@ -322,9 +322,9 @@
<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
<!--Active directory dependency module: msal4j and transitive -->
<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
@@ -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,11 +262,11 @@
<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" />
<IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 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" REQUIRED="true" />
<!-- REQUIRED FOR GOOGLE STORAGE -->
<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0" REQUIRED="true" />
<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" 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,12 +14,12 @@ 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
ACTION_ON_DATA.NAME=\u30C7\u30FC\u30BF\u3078\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
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
ACTION_ON_DATA.ITEM.EMPTY=\u7A7A
BULK_FILE_ALREADY_EXIST.NAME=\u30D0\u30EB\u30AF\u30D5\u30A1\u30A4\u30EB\u304CGoogle Storage\u306B\u65E2\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059
BULK_FILE_ALREADY_EXIST.NAME=\u30D0\u30EB\u30AF\u30D5\u30A1\u30A4\u30EB\u304CGoogle Storage\u306B\u65E2\u306B\u5B58\u5728\u3059\u308B
GS_ACCESS_KEY.NAME=\u30A2\u30AF\u30BB\u30B9\u30AD\u30FC
GS_SECRET_KEY.NAME=\u30B7\u30FC\u30AF\u30EC\u30C3\u30C8\u30AD\u30FC
GS_LOCAL_FILE.NAME=\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u30D5\u30A1\u30A4\u30EB
@@ -29,7 +29,7 @@ BUCKET_NAME.NAME=\u30D0\u30B1\u30C3\u30C8
GS_CONF.NAME=Google\u30B9\u30C8\u30EC\u30FC\u30B8\u8A2D\u5B9A
ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
TOKEN_NAME.NAME=\u30C8\u30FC\u30AF\u30F3\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5\u30A1\u30A4\u30EB\u540D
SET_FIELD_DELIMITER.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A\u8A18\u53F7\u3092\u6307\u5B9A
SET_FIELD_DELIMITER.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A\u3092\u6307\u5B9A
FIELD_DELIMITER.NAME=
USE_CUSTOM_NULL_MARKER.NAME=\u30AB\u30B9\u30BF\u30E0Null\u30DE\u30FC\u30AB\u30FC\u306E\u4F7F\u7528
CUSTOM_NULL_MARKER.NAME=

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,11 +205,11 @@
<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" />
<IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 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" REQUIRED="true" />
<IMPORT NAME="google-cloud-bigquery-1.126.3.jar" MODULE="google-cloud-bigquery-1.126.3.jar" MVN="mvn:com.google.cloud/google-cloud-bigquery/1.126.3" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<!-- TODO remove it -->
@@ -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

@@ -14,7 +14,7 @@ ACCESS_TOKEN.NAME=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
QUERY.NAME=\u30AF\u30A8\u30EA\u30FC
SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
ADVANCED_SEPARATOR.NAME=\u9AD8\u5EA6\u306A\u533A\u5207\u308A\u8A18\u53F7(\u6570\u5B57\u7528)
ADVANCED_SEPARATOR.NAME=\u9AD8\u5EA6\u306A\u533A\u5207\u308A(\u6570\u5B57\u7528)
DECIMAL_SEPARATOR.NAME=\u5C0F\u6570\u70B9\u533A\u5207\u308A\u6587\u5B57
THOUSANDS_SEPARATOR.NAME=\u6841\u533A\u5207\u308A
TOKEN_NAME.NAME=\u30C8\u30FC\u30AF\u30F3\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5\u30A1\u30A4\u30EB\u540D

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

@@ -13,7 +13,7 @@ FIELDS_TERMINATED_BY.NAME=Fields terminated by
FILENAME.NAME=Local filename
FLUSHONROW.NAME=Custom the flush buffer size
FLUSHONROW_NUM.NAME=Row number
LONG.NAME=Connects and loads data from a flow into Google BigQuery
LONG_NAME=Connects and loads data from a flow into Google BigQuery
HELP=org.talend.help.tBigQueryOutput
AUTHENTICATION.NAME=Authentication
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=Service account credentials 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

@@ -13,7 +13,7 @@ FIELDS_TERMINATED_BY.NAME=Champs termin\u00E9s par
FILENAME.NAME=Nom du fichier local
FLUSHONROW.NAME=Personnaliser la taille de la m\u00E9moire tampon
FLUSHONROW_NUM.NAME=Nombre de lignes
LONG.NAME=Se connecte \u00E0 Google BigQuery et y charge des donn\u00E9es \u00E0 partir d'un flux
LONG_NAME=Se connecte \u00E0 Google BigQuery et y charge des donn\u00E9es \u00E0 partir d'un flux
HELP=org.talend.help.tBigQueryOutput
AUTHENTICATION.NAME=Authentification
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=Fichier d'identifiants du compte de service
@@ -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

@@ -9,11 +9,11 @@ ESCAPE_CHAR.ITEM.ESCAPE_MODE_BACKSLASH='\\'
ESCAPE_CHAR.ITEM.ESCAPE_MODE_DOUBLED=\u6587\u5B57\u5217\u306E\u4E8C\u91CD\u5F15\u7528\u7B26
ESCAPE_CHAR.NAME=\u30A8\u30B9\u30B1\u30FC\u30D7\u6587\u5B57
FIELDSEPARATOR.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A
FIELDS_TERMINATED_BY.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A\u8A18\u53F7
FIELDS_TERMINATED_BY.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A
FILENAME.NAME=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u540D
FLUSHONROW.NAME=\u30D5\u30E9\u30C3\u30B7\u30E5\u30D0\u30C3\u30D5\u30A1\u30FC\u30B5\u30A4\u30BA\u306E\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA
FLUSHONROW_NUM.NAME=\u884C\u756A\u53F7
LONG.NAME=Google BigQuery\u306B\u63A5\u7D9A\u3057\u3001\u30D5\u30ED\u30FC\u304B\u3089\u30C7\u30FC\u30BF\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059
LONG_NAME=Google BigQuery\u306B\u63A5\u7D9A\u3057\u3001\u30D5\u30ED\u30FC\u304B\u3089\u30C7\u30FC\u30BF\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059
HELP=org.talend.help.tBigQueryOutput
AUTHENTICATION.NAME=\u8A8D\u8A3C
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8\u8A8D\u8A3C\u60C5\u5831\u30D5\u30A1\u30A4\u30EB
@@ -29,8 +29,8 @@ 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
ACTION_ON_DATA.NAME=\u30C7\u30FC\u30BF\u3078\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
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
ACTION_ON_DATA.ITEM.EMPTY=\u7A7A
@@ -42,7 +42,7 @@ GS_FILE.NAME=\u30D5\u30A1\u30A4\u30EB
GS_FILE_HEADER.NAME=\u30D8\u30C3\u30C0\u30FC
BUCKET_NAME.NAME=\u30D0\u30B1\u30C3\u30C8
GS_CONF.NAME=Google\u30B9\u30C8\u30EC\u30FC\u30B8\u8A2D\u5B9A
SET_FIELD_DELIMITER.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A\u8A18\u53F7\u3092\u6307\u5B9A
SET_FIELD_DELIMITER.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A\u3092\u6307\u5B9A
FIELD_DELIMITER.NAME=
TOKEN_NAME.NAME=\u30C8\u30FC\u30AF\u30F3\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5\u30A1\u30A4\u30EB\u540D
CHECK_DISK_SPACE.NAME=\u30C7\u30A3\u30B9\u30AF\u5BB9\u91CF\u306E\u78BA\u8A8D
@@ -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

@@ -13,7 +13,7 @@ FIELDS_TERMINATED_BY.NAME=\u5B57\u6BB5\u7EC8\u6B62\u7B26
FILENAME.NAME=\u672C\u5730\u6587\u4EF6\u540D
FLUSHONROW.NAME=\u81EA\u5B9A\u4E49\u7F13\u51B2\u533A\u5927\u5C0F
FLUSHONROW_NUM.NAME=\u884C\u53F7
LONG.NAME=\u8FDE\u63A5\u6570\u636E\u6D41\u4E2D\u7684\u6570\u636E\u5E76\u5C06\u5176\u52A0\u8F7D\u5230 Google BigQuery \u4E2D
LONG_NAME=\u8FDE\u63A5\u6570\u636E\u6D41\u4E2D\u7684\u6570\u636E\u5E76\u5C06\u5176\u52A0\u8F7D\u5230 Google BigQuery \u4E2D
HELP=org.talend.help.tBigQueryOutput
AUTHENTICATION.NAME=\u8EAB\u4EFD\u9A8C\u8BC1
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=\u670D\u52A1\u5E10\u6237\u7528\u6237\u540D\u548C\u5BC6\u7801\u6587\u4EF6
@@ -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,12 +191,12 @@
<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" />
<IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar"
MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 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" REQUIRED="true"/>
<IMPORT NAME="google-cloud-bigquery-1.126.3.jar" MODULE="google-cloud-bigquery-1.126.3.jar"
MVN="mvn:com.google.cloud/google-cloud-bigquery/1.126.3"
REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
@@ -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

@@ -14,7 +14,7 @@ ACCESS_TOKEN.NAME=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
QUERY.NAME=\u30AF\u30A8\u30EA\u30FC
SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
ADVANCED_SEPARATOR.NAME=\u9AD8\u5EA6\u306A\u533A\u5207\u308A\u8A18\u53F7(\u6570\u5B57\u7528)
ADVANCED_SEPARATOR.NAME=\u9AD8\u5EA6\u306A\u533A\u5207\u308A(\u6570\u5B57\u7528)
DECIMAL_SEPARATOR.NAME=\u5C0F\u6570\u70B9\u533A\u5207\u308A\u6587\u5B57
THOUSANDS_SEPARATOR.NAME=\u6841\u533A\u5207\u308A
TOKEN_NAME.NAME=\u30C8\u30FC\u30AF\u30F3\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5\u30A1\u30A4\u30EB\u540D

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