Compare commits

...

106 Commits

Author SHA1 Message Date
Xilai Dai
f015a3f545 fix(APPINT-36075) The default image name and tag are lost when build job as docker image (#9497) 2024-01-15 18:19:54 +08:00
AlixMetivier
a1ee63bf48 fix(TBD-15957): fix pattern issue when migrating dates (#9492) 2024-01-12 09:17:28 +01:00
bhe-talendbj
06045b738b fix(TUP-41511): TMC: Token expired warning shows if connection timed out (#9488)
* fix(TUP-41511): throw exception

* fix(TUP-41511): add connect error message

* fix(TUP-41511): add connect error message

* fix(TUP-41511): fix list projects

* fix(TUP-41511): update error message
2024-01-12 14:35:33 +08:00
sbliu
6ab4d2aee1 feat(TUP-32134) correct the copied/paste, delete action for job (#9345)
* feat(TUP-32134) correct the copied joblet collapse status when target job/joblet is not the same source job/joblet

* fix problem copy/delete subjob not work as expected

* support copy&paste expanded joblet in bd/bd stream job

* refactor

* judge copy&paste joblet for different job type

* avoid caculate marquee selection for subjob collapsed

* refactor

* correct subjobcontainer after paste display issue

* copy collapsed subjob contains expanded joblet

* fix copy of expand subjob which contains expanded joblet

* change for delete subcontainer of bd/bd stream job
2024-01-10 18:32:32 +08:00
wang wei
caf0b2f570 fix(TDI-50271): Denial Of Service (DoS) Memory And CPU Consumption in Talend/connectors-lib-se (main) (#9096) 2024-01-10 14:58:02 +08:00
jzhao
60c308ee3a fix(TDI-50429): bump talend-mscrm vrsion 3.17-20231214 (#9397) 2024-01-10 09:57:38 +08:00
vyu-talend
e98e74678b feat(TDI-40295):enable tagging for s3. (#9277)
* feat(TDI-40295):enable tagging for s3.

* feat(TDI-40295): move feature to advanced setting.
2024-01-08 10:19:20 +08:00
jiezhang-tlnd
7dec99832c fix(TUP-38087)tELTPostgresqlMap generate sql fail when input table with (#9433)
* fix(TUP-38087)tELTPostgresqlMap generate sql fail when input table with

* add junit for context name equals column name

* fix context and colum name

* fix condition

* code format

* list to set

* code format

* code format

* list to set
2024-01-05 11:29:52 +08:00
hzhao
96b040315e fix(TUP-41404): dummy change to update the plugin timestamp (#9463) 2024-01-04 16:14:44 +08:00
kjwang
e86edeb24c Fix TUP-41323 can't create Box/Boxlist from the folder node (#9440)
Fix TUP-41323 can't create Box/Boxlist from the folder node
https://jira.talendforge.org/browse/TUP-41323
2024-01-02 10:08:47 +08:00
Oleksandr Zhelezniak
84bc6b6506 fix(TCOMP-2573): check tck null config values (#9358) 2023-12-29 12:29:45 +02:00
jzhao
b53775023f fix(TDI-50687): sshd-sftp:2.9.2 | CVE-2023-35887 (#9413) 2023-12-28 19:46:34 +08:00
jzhao
f4dadfe45f fix(TDI-50238): bcprov-jdk15on:1.70 | CVE-2023-33201 (#9388) 2023-12-28 19:40:52 +08:00
jiezhang-tlnd
7ca6212d1c chore(TUP-39612)bcprov-jdk15on:1.70 | CVE-2023-33201 (#9386) 2023-12-28 11:16:29 +08:00
kjwang
c0387e0cf9 TUP-41008 Fix potential problem that create TCK virtual component may use wrong component id (#9387)
* TUP-41008 Fix potential problem that create TCK virtual component may
use wrong component id
https://jira.talendforge.org/browse/TUP-41008
2023-12-28 09:58:21 +08:00
Oleksandr Zhelezniak
5e16b805b7 chore(TDI-50665): bump com.ibm.mq.allclient (#9403)
* to 9.3.4.0 to align with tck connectors
* add jackson
2023-12-26 14:36:12 +02:00
zyuan-talend
70690f3823 fix(TUP-41256):Update jars linked to EDI component. (#9398) 2023-12-26 18:45:52 +08:00
Chao MENG
5060386633 fix(TUP-41341): Can't use other login mode in Studio 8.0.1 with (#9429)
R2023-12v2 patch applied
https://jira.talendforge.org/browse/TUP-41341
2023-12-22 17:59:26 +08:00
Chao MENG
5dc6182566 fix(TUP-41341): Can't use other login mode in Studio 8.0.1 with R2023-12v2 patch applied (#9422)
* fix(TUP-41341): Can't use other login mode in Studio 8.0.1 with
R2023-12v2 patch applied
https://jira.talendforge.org/browse/TUP-41341

* fix(TUP-41341): Can't use other login mode in Studio 8.0.1 with
R2023-12v2 patch applied
https://jira.talendforge.org/browse/TUP-41341
2023-12-22 15:53:05 +08:00
Jill Yan
bc24b0a472 APPINT-36075 fix ui error (#9419) 2023-12-22 14:46:21 +08:00
hzhao
414e8b93c1 fix(TUP-40887): Mac Sonoma issue with image flipped (#9404)
* fix(TUP-40887): Mac Sonoma issue with image flipped

* fix(TUP-40887):  try remove listener

* fix(TUP-40887): add back resourceDisposeListener

* fix(TUP-40887): Mac Sonoma issue with image flipped

* fix(TUP-40887): Mac Sonoma issue with image flipped

* fix(TUP-40887): Mac Sonoma issue with image flipped
2023-12-21 10:42:42 +08:00
Zhiwei Xue
44479041b0 fix(TUP-41062):TCK server is unavailable after doing some actions of TCK (#9363)
metadata
2023-12-21 10:40:49 +08:00
sbliu
42ec8f8843 chore(TUP-40457) exception log in CommandLine log file (#9323) 2023-12-21 10:03:55 +08:00
Svitlana Anulich
b4325c119d fix(TBD-15797): CVE Fixes for R2024-01 (#9385) 2023-12-20 15:45:16 +02:00
Chao MENG
f43cf88fc6 chore: update jdbc feature to fix junit failure (#9412) 2023-12-20 20:33:29 +08:00
Oleksandr Zhelezniak
a3c32f71d5 fix(TDI-50691): Mom components typo in label (#9414) 2023-12-20 12:54:55 +02:00
kjwang
751b7cc822 TUP-41235 context parameter not popup when click Guess schema for tJDBCInput (#9395)
* TUP-41235 context parameter not popup when click Guess schema for
tJDBCInput
https://jira.talendforge.org/browse/TUP-41235
2023-12-20 16:46:33 +08:00
hcyi
449122a6aa fix(TUP-40985):The table column in tFixflowInput is editable but can't (#9329)
save the changes.
2023-12-20 16:30:45 +08:00
hcyi
72c3c39960 fix(TUP-40364):TCK Drag&Drop dataset keep only last element of List property. (#9340)
* fix(TUP-40364):TCK Drag&Drop dataset keep only last element of List
property.

* fix(TUP-40364):get error when open old job.
2023-12-19 16:29:25 +08:00
Chao MENG
4aa7d424b7 fix(TUP-41291): Studio broken after R2023-12 (#9408)
https://jira.talendforge.org/browse/TUP-41291
2023-12-19 15:40:50 +08:00
bhe-talendbj
2e15e66b24 fix(TUP-41020): LDAP Metadata : Check Authentication fails when Encryption method = LDAPS(SSL) even with correct credentials. (#9325)
* fix(TUP-41020): init default trust manager if cacerts not found

* fix(TUP-41020): update timestamp of local provider

* fix(TUP-41020): update version

* fix(TUP-41020): update component lib
2023-12-18 10:09:51 +08:00
Zhiwei Xue
39d54b3dad fix(TUP-41243):workday: value for "X509 certificate" is editable after export to context (#9391)
* fix(TUP-41243):workday: value for "X509 certificate" is editable after
export to context

* fix(TUP-41243):fix font in connector
2023-12-15 18:40:07 +08:00
Zhiwei Xue
dab790308a fix(TUP-41183):"Can't find the jdbc driver class" pop up when check jdbc (#9384)
connection with context mode migrated from 73
2023-12-15 18:39:55 +08:00
pyzhou
eb42866a1e fix(TDI-50450):cve upgrade snappy-java to 1.1.10.5 (#9328) 2023-12-15 11:14:49 +08:00
jiezhang-tlnd
1fac6fa003 Jzhang/80/tup 40311 junit fix (#9389)
* chore(TUP-40311)fix junit

* fix junit
2023-12-13 14:51:24 +08:00
vyu-talend
bdf8a1ccc0 chore(TDI-50381):update jars to release version for edi components. (#9271) (#9382)
* chore(TDI-50381):update jars to release version for edi components.

* chore(TDI-50381):remove snapshot.
2023-12-11 12:04:44 +08:00
hcyi
04183a48b6 fix(TUP-41047):looup on the Reject line working in the non-flow way (#9369) 2023-12-11 09:45:26 +08:00
Zhiwei Xue
714969ea1e fix(TUP-41147):context value for Drivers can't revert back (#9368)
* fix(TUP-41147):context value for Drivers can't revert back

* fix(TUP-41147): fix quote issue for multi driver jars
2023-12-08 18:36:55 +08:00
Zhiwei Xue
aa15e17e54 fix(TUP-41154):TcompV0 metadata refresh issue when only parts feature (#9372)
installed
2023-12-08 18:21:06 +08:00
sbliu
481b01d88c Revert "fix(TUP-41057) refactor (#9331)" (#9375)
This reverts commit c7883b0d1d.
2023-12-08 17:02:00 +08:00
Jane Ding
b04edb9cd5 Add localized files (#9377)
* Add localized files (#9365)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9366)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
2023-12-08 16:03:26 +08:00
kjwang
6519b70981 Fix TUP-41134 MVN url for some JDBC connection add -SNAPSHOT after (#9362)
Fix TUP-41134 MVN url for some JDBC connection add -SNAPSHOT after migration to R2023-11
https://jira.talendforge.org/browse/TUP-41134
2023-12-07 15:16:16 +08:00
hcyi
bb3e1ef604 fix(TUP-41047):[TCK] Problems on the Reject line working in the non-flow (#9355)
way
2023-12-06 17:53:06 +08:00
hcyi
2c267d8d50 fix(TUP-40771):Remove plugin org.talend.studio.components.tcompv0.jdbc. (#9247)
* fix(TUP-40771):Remove plugin org.talend.studio.components.tcompv0.jdbc.

* fix(TUP-40771):Remove plugin org.talend.studio.components.tcompv0.jdbc.

* fix(TUP-40771):add org.talend.components.jdbc.definition to tck jdbc
feature
2023-12-05 16:27:51 +08:00
msjian
a30eabaa1b fix(TDQ-21624): fix tck jdbc DQ dependency update (#9316)
* fix(TDQ-21563): fix tck jdbc notifyDQSQLExplorer
2023-12-05 09:58:50 +08:00
zyuan-talend
0cd731e686 fix(TUP-40250):Replace GAV from org.talend.libraries with official GAV. (#9352)
* fix(TUP-40250):Replace GAV from org.talend.libraries with official GAV.

* fix(TUP-41079): revert for mysql/oracle migration task.
2023-12-04 16:52:31 +08:00
kjwang
eed12d3e34 TUP-35985 [Runtime convergence] Wrapper connector for legacy and tck (#9337)
* TUP-35985 [Runtime convergence] Wrapper connector for legacy and tck
DataprepRun
https://jira.talendforge.org/browse/TUP-35985
2023-12-04 16:46:13 +08:00
pyzhou
37057d6228 Revert "feat(TUP-39961)Set visible to false for tDBCDC and tDBCDCOutput (#9019) (#9027)" (#9258)
This reverts commit 11442c0f6c.
2023-12-04 16:35:33 +08:00
sbliu
c7883b0d1d fix(TUP-41057) refactor (#9331)
* fix(TUP-41057) refactor

* fix(TUP-41057) remove code that re-add dnd support for table
2023-12-04 11:35:22 +08:00
Zhiwei Xue
9a8c172e8d fix(TUP-40423):[bug] RabbitMQ: can't input queue name after export to context (#9297)
* fix(TUP-40423):[bug] RabbitMQ: can't input queue name after export to
context

* fix(TUP-40903):[bug] Can't open repository connection wizard in
connector

* fix(TUP-40914):Show context button both in Main and Advanced page

* feat(TUP-40560):Only export simple fields with text controller to
context mode on TCK metadata

* fix(TUP-41037):[bug] couchbase export to context error.

* fix(TUP-41005):[bug] In Context Mode, fields which are not text field
shows yellow

* fix(TUP-41052):Finish button is disabled when switch workday to context
mode

* fix(TUP-41039):[bug] couchbase connection parameters will be separated
after do export to context and revert context.
2023-12-01 16:58:57 +08:00
sbliu
8dbb11a91a chore(TUP-40453) upgrade avro from 1.11.2 to 1.11.3 (#9251) 2023-11-30 17:25:57 +08:00
Jane Ding
644ecc5a26 Add localized files (#9344)
* Add localized files (#9341)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9342)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9343)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Toshi Sasada <51699524+tsasada-talend@users.noreply.github.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
2023-11-30 17:15:22 +08:00
kjwang
c0ef7e02ec Fix : TUP-40702 TCK - Migration map misses TABLE (Fix missing parameter (#9319)
Fix : TUP-40702 TCK - Migration map misses TABLE (Fix missing parameter issue)
https://jira.talendforge.org/browse/TUP-40702
2023-11-30 14:57:39 +08:00
Zhiwei Xue
a54916f18a fix(TUP-40987):[TCK][GoogleAnlytics]The UI problems related with Google (#9322)
Analytics Metadata after adding a read timeout in the advanced setting
2023-11-29 17:20:33 +08:00
hzhao
83166701ab fix(TUP-40659) : Wrong jar list when send jars to the cluster (#9307)
* fix(TUP-40659) : Wrong jar list when send jars to the cluster

* fix(TUP-40659) : optimize functions

* fix(TUP-40659) :  add log

* fix(TUP-40659) : skip check highPriorityModuleNeeded

* fix(TUP-40659) : add junit

* fix(TUP-40659) :  fix junit

* fix(TUP-40659) : add sys property

* fix(TUP-40659) :  remove extra ,

* feat(TUP-39181): Force PAT rotation on Studio login (#9253)

* feat(TUP-39181): initial impl

* feat(TUP-39181): exclude sso tokane

* feat(TUP-39181): need to block fetching license if old PAT

* feat(TUP-39181): fix sso login

* fix(TUP-40895):Can't refresh UI when switch proxy type. (#9291)

* fix(TDI-50399): Json:20230227 | CVE-2023-5072 (#9282)

* fix(TUP-40723):"Specify a data source alias" and "Use or register a (#9238)

shared db connection" is disabled after d&d jdbc into job

* Add localized files (#9313)

* Add localized files (#9311)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9312)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
Co-authored-by: Toshi Sasada <51699524+tsasada-talend@users.noreply.github.com>

* fix(TUP-40770):hide tck (#9255)

tjdbcoutputbulkexec/tjdbcoutputbulk/tjdbcbulkexec as they only for
tsinglestorexxx

* fix(TUP-40659) : Wrong jar list when send jars to the cluster

* fix(TUP-40659) : optimize functions

* fix(TUP-40659) :  add log

* fix(TUP-40659) : skip check highPriorityModuleNeeded

* fix(TUP-40659) : add junit

* fix(TUP-40659) :  fix junit

* fix(TUP-40659) : add sys property

* fix(TUP-40659) :  remove extra ,

---------

Co-authored-by: bhe-talendbj <52311292+bhe-talendbj@users.noreply.github.com>
Co-authored-by: hcyi <hcyi@talend.com>
Co-authored-by: jzhao <jzhao@talend.com>
Co-authored-by: Jane Ding <jding@talend.com>
Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
Co-authored-by: Toshi Sasada <51699524+tsasada-talend@users.noreply.github.com>
Co-authored-by: Zhiwei Xue <zwxue@talend.com>
2023-11-29 16:50:29 +08:00
mhryb
55116f9c1b fix(TDI-49793): fix release streams in tMap (#9293)
* fix(TDI-49793): fix release streams in tMap
2023-11-28 13:21:24 +02:00
pyzhou
753ffdaf31 fix(TDI-50544):tFileFetch set connection timeout (#9298) 2023-11-28 10:32:15 +08:00
Dmytro Sylaiev
4ea8311764 fix(TDI-50539): Fix lib mvn URI for MDM (#9294)
Co-authored-by: Qiyan Liu <QIU@qlik.com>
2023-11-27 12:30:15 +02:00
hcyi
2b9fd057da fix(TUP-40479):[bug] proxy not working when guess schema and not fill (#9228)
http.
2023-11-27 18:14:27 +08:00
sbliu
20df66b4c8 feat(TUP-39894) add dnd support for table created for component (#9295) 2023-11-27 14:24:52 +08:00
hcyi
6008069c7f fix(TUP-40869):Import items throw error: id should not be null. (#9299) 2023-11-27 10:31:22 +08:00
wang wei
6935ceb1ba fix(TDI-50584): job failed to generate code after installing R2023-11 (#9318) 2023-11-24 18:59:04 +08:00
Zhiwei Xue
21e3f8688b fix(TUP-40770):hide tck (#9255)
tjdbcoutputbulkexec/tjdbcoutputbulk/tjdbcbulkexec as they only for
tsinglestorexxx
2023-11-23 17:45:11 +08:00
Jane Ding
0bb19c6e9e Add localized files (#9313)
* Add localized files (#9311)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9312)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
Co-authored-by: Toshi Sasada <51699524+tsasada-talend@users.noreply.github.com>
2023-11-23 17:43:36 +08:00
hcyi
dd8c494fd7 fix(TUP-40723):"Specify a data source alias" and "Use or register a (#9238)
shared db connection" is disabled after d&d jdbc into job
2023-11-23 13:03:43 +08:00
jzhao
a4348abdc5 fix(TDI-50399): Json:20230227 | CVE-2023-5072 (#9282) 2023-11-22 17:02:28 +08:00
hcyi
7d63f93a98 fix(TUP-40895):Can't refresh UI when switch proxy type. (#9291) 2023-11-22 09:57:09 +08:00
bhe-talendbj
9072ea152e feat(TUP-39181): Force PAT rotation on Studio login (#9253)
* feat(TUP-39181): initial impl

* feat(TUP-39181): exclude sso tokane

* feat(TUP-39181): need to block fetching license if old PAT

* feat(TUP-39181): fix sso login
2023-11-22 09:32:36 +08:00
kjwang
7df9d670aa Fix TUP-40702 TCK Migration map misses TABLE (#9205)
Fix TUP-40702 TCK Migration map misses TABLE
https://jira.talendforge.org/browse/TUP-40702
2023-11-21 16:26:35 +08:00
kjwang
419c646277 Fix TUP-40738 Implicit tContextLoad do not show Password as context mode (#9230)
Fix TUP-40738 Implicit tContextLoad do not show Password as context mode
https://jira.talendforge.org/browse/TUP-40738
2023-11-21 15:15:28 +08:00
Oleksandr Zhelezniak
f1fb423be4 fix(TDI-50482): cve bump activemq-client 5.18.3 (#9236)
* cve bump activemq-client 5.18.3
* update transitive libraries
2023-11-20 14:28:24 +02:00
wang wei
a002194a25 fix(TDI-50538): [JDBC TCK]: close db connection for osgi env safely (#9284) 2023-11-16 16:58:57 +08:00
Jane Ding
98d08a34ed Add localized files (#9289)
* Add localized files (#9286)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9287)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9288)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
Co-authored-by: Toshi Sasada <51699524+tsasada-talend@users.noreply.github.com>
2023-11-16 16:58:27 +08:00
hcyi
2adfb1a81b fix(TUP-40885):Workday metadata found metadata UI show issue whcih (#9279) (#9280)
related to UIScope function
2023-11-15 20:45:52 +08:00
kjwang
aed6ab978a Fix TDQ-21560 import an existing project of R2023-10 or older, open (#9267) (#9272)
* Fix TDQ-21560 import an existing project of R2023-10 or older, open
analysis lost its JDBC connection
https://jira.talendforge.org/browse/TDQ-21560
2023-11-15 15:36:57 +08:00
kjwang
36332dee59 TUP-40862 NPE show when select connection from component list for (#9266) (#9268)
* TUP-40862 NPE show when select connection from component list for
migrated jdbc context jobs
https://jira.talendforge.org/browse/TUP-40862
2023-11-15 10:46:47 +08:00
kjwang
1c4f46e942 Fix TUP-40710 TCK-JDBC Dynamic setting view (#9223)
* Fix TUP-40710 TCK-JDBC Dynamic setting view
https://jira.talendforge.org/browse/TUP-40710

* Fix TUP-40710 TCK-JDBC Dynamic setting view
https://jira.talendforge.org/browse/TUP-40710

* Fix jdbc connection/close component id error

* TUP-40710 TCK-JDBC Dynamic setting view
https://jira.talendforge.org/browse/TUP-40710

* more fix

* fix the NPE as the strange tcompv0 model response for empty table

* Fix die on error for jdbc row

* TUP-40792 migration issue for tCompv0 to tck jdbc with Dynamic setting
(Fix update invalid value from repository)

* kjwang/Fix_TUP-40710_TCK-JDBC_Dynamic_setting_view

* more fix

* more fix

* improve performance

* Fix one convert error

* Correct Component Name

---------

Co-authored-by: wwang <wwang@talend.com>
2023-11-13 17:58:14 +08:00
mhryb
a06d774108 fix(TDI-50516): fix include header (#9261) 2023-11-13 10:55:28 +02:00
Jane Ding
95c1202a8e Add localized files (#9259)
* Add localized files (#9249)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9250)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9254)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
Co-authored-by: Toshi Sasada <51699524+tsasada-talend@users.noreply.github.com>
2023-11-13 14:20:10 +08:00
wang wei
1ddca53d50 fix(TDI-50467): [JDBC TCK]: migrate label view (#9218) 2023-11-09 17:13:44 +08:00
sbliu
76dbc39e66 fix(TUP-40478) encode file path for classloader url (#9202)
* fix(TUP-40478) encode file path for classloader url

* fix problem that cannot run job when path contains special character
2023-11-09 11:47:35 +08:00
Chao MENG
01e79e7a7e fix(TUP-40317): Metadata based Hadoop cluster Repository type is showing (#9146)
inconsistent grey out UI for Runtime mode.
https://jira.talendforge.org/browse/TUP-40317
2023-11-09 11:07:58 +08:00
Dmytro Sylaiev
02fb11dcd4 fix(TDI-50296): Add checkbox to bring old behavior (#9156)
* fix(TDI-50296): Add checkbox to bring old behavior

* fix(TDI-50296): Fix component breaking bcs of case
2023-11-08 12:17:25 +02:00
kjwang
f45cc4154d Fix TUP-40766 NPE show in error log when close Choose context wizard (#9242)
Fix TUP-40766 NPE show in error log when close Choose context wizard
https://jira.talendforge.org/browse/TUP-40766
2023-11-08 17:37:48 +08:00
wang wei
fdaea4bbf0 fix(TCOMP-2552): support custom connection/close component icon for tck connector in studio(#9245) 2023-11-08 16:05:23 +08:00
hzhao
791fba4e55 feat(TUP-36963):Display Row Number is zero when import (#9232) 2023-11-08 15:51:07 +08:00
mhryb
7fb59d7f0e fix(TDI-50483): fix tPostgresPlusOutputBulk component migration (#9235) 2023-11-08 09:46:41 +02:00
kjwang
d37214d277 Fix:TUP-40760 SingleStore: Mapping file Field is yellow and read-only on (#9237)
Fix:TUP-40760 SingleStore: Mapping file Field is yellow and read-only on DB wizard after migration
https://jira.talendforge.org/browse/TUP-40760
2023-11-08 11:38:56 +08:00
sbliu
a58d7c9d1c fix(TUP-39867) Studio 8.0.1 with R2023-05 version in Guess option (#9221) 2023-11-08 11:31:20 +08:00
Jane Ding
e05a70073e Add localized files (#9231) (#9233)
Co-authored-by: Toshi Sasada <51699524+tsasada-talend@users.noreply.github.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
2023-11-07 09:52:11 +08:00
Jill Yan
bebe81ef37 APPINT-35964 remove usless migration task (#9226) 2023-11-06 19:27:41 +08:00
jiezhang-tlnd
24ddd70b72 Jzhang/80/tup 40311 (#9167)
* feat(TUP-40311)[Refactor] Unify tPostgresPlus component to reuse
tPostgres

* remove posgresplus

* add migration

* code format

* migration for JobSettings

* code format

* Update ChangeToPostgresInJobSettingsMigrationTask.java

update date

* Update ReplacePostgresPlusConnectionByPostgresConnectionMigrationTask.java

update migration date

* update migration

* dd migration for project setting

* update migratin for project setting

* update migration for project setting
2023-11-06 10:40:35 +08:00
mhryb
a0ba4fa179 feat(TDI-49775): add support application default credentials (#9220)
* feat(TDI-49775): add support application default credentials
2023-11-03 12:20:17 +02:00
mhryb
8878b983c4 feat(TDI-50282): unify tPostgresPlus component to reuse tPostgres (#9169)
* feat(TDI-50282): unify tPostgresPlus component to reuse tPostgres
2023-11-03 11:11:56 +02:00
Jane Ding
1b6e82c73d Add localized files (#9215)
* Add localized files (#9209)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9210)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
2023-11-02 20:25:46 +08:00
mhryb
8a35240fc1 Mhryb/tdi 49775 add support application default credentials 8.0 (#9211)
* feat(TDI-49775): add support application default credentials
2023-11-02 14:25:19 +02:00
Oleksandr Zhelezniak
238bf1c36f fix(TDI-50348): NB_LINE 0 for empty sheet (#9171)
*  tFileInputExcel for empty sheet will be zero instead of 0
2023-11-02 13:08:52 +02:00
kjwang
81267113c4 Kjwang/feat tup 39096 new tck jdbc integrate (#8917)
* Use local component file

* Add new jdbc plugin

* Fix build issue

* Fix build issue

* Improve the code

* Improve the code

* Add i18n

* Improve the code

* TUP-39075 Handle the d&d of metadata tables/queries to DI/BD/APPINT jobs
after JDBC TCK integration

* Fix table name parameter issue

* Fix dnd query node issues

* Improve the code

* Fix spark job dnd issue

* Fix tck jdbc dnd issue

* feat(TUP-38956):Change the repository Db Connections display to prepare
for TCK JDBC integration

* Fix new jdbc node context menu issue

* feat(TUP-39078):Make the TCK JDBC work with db unified system.

* feat(TUP-39078):Make the TCK JDBC work with db unified system.

* TUP-39525 Save and Load TCK connection items from metadata/connections
instead of tacokit folder in project

* TUP-39525 Save and Load TCK connection items from metadata/connections
instead of tacokit folder in project

* TUP-39525 Save and Load TCK connection items from metadata/connections
instead of tacokit folder in project

* Improve context menu

* Support edit new jdbc schema

* fix(TUP-39575):Implement new jdbc mapping file field list in new jdbc
wizard.

* feat(TUP-38956):integrate tck jdbc and snowflake to db connections

* fix(TUP-35088):Stats&logs with TCK JDBC.

* feat(TUP-38956):fix repository connection select and import dialog for
tck jdbc and snowflake

* TUP-35524 JDBC repository metadata migration
https://jira.talendforge.org/browse/TUP-35524

* TUP-39577 Make data view function can work with new jdbc connection and
input component
https://jira.talendforge.org/browse/TUP-39577

* fix(TUP-35088):Stats&logs with TCK JDBC.

* fix(TUP-39460):Hide specific parameters for tck connectors on wizard.

* feat(TUP-39073):[JDBC TCK]: reuse SQL builder when click button beside on "Query" field (#8959)

* feat(TUP-39073):[JDBC TCK]: reuse SQL builder when click button beside
on "Query" field
https://jira.talendforge.org/browse/TUP-39073

* fix(TUP-39460):Hide specific parameters for tck connectors on wizard.

* feat(TUP-39078):Make the TCK JDBC work with db unified system.

* Improve migration task

* Fix a error

* feat(TUP-39073):[JDBC TCK]: reuse SQL builder when click button beside (#8964)

on "Query" field
https://jira.talendforge.org/browse/TUP-39073

* Fix data viewer issues

* fix(TUP-35088):Stats&logs with TCK JDBC.

* Improve context menu

* Fix a error

* feat(TUP-39074):Implicit context load with TCK JDBC

* Improve the code fix possible issues

* feat(TUP-39074):improve for Implicit context load with TCK JDBC

* feat(TUP-39074):improve for Implicit context load with TCK JDBC

* feat(TUP-39074):improve for Implicit context load with TCK JDBC

* Fix a error when crete tck jdbc connection

* Fix tck jdbc error

* feat(TUP-39080):Delta lake/Single store move from tcompv0 JDBC to TCK

* feat(TUP-39080):remove quotes

* Kjwang/feat tup 39096 new tck jdbc integrate with tup 25445 (#9012)

* feat(TUP-25445)acokit support context in repository metadata
https://jira.talendforge.org/browse/TUP-25445

* Fix jdbc driver issue on context mode

* feat(TUP-39080):fix connection and remove quotes

* feat(TUP-39076):[JDBC TCK]: support schema based table field

* Fix TUP-39910 duplicate "Read Queries" under saved queries' node
https://jira.talendforge.org/browse/TUP-39910

* fix(TUP-39096): rename jdbc (#9018)

* rename family name from JDBCNew to JDBC

* rename family name from JDBCNew to JDBC

* Test jdbc migration rename -- KK

* Test jdbc migration rename -- KK

---------

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

* Remove used code

* feat(TUP-39076):improve for Support PREV_COLUMN_LIST / NEXT_COLUMN_LIST
and BaseOnSchema

* Fix TUP-40043 Tacokit (#9044)

* Hcyi/add localized files 2023 8 11 (#9034)

* Add localized files (#9033)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9032)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9031)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
Co-authored-by: tsasada-talend <51699524+tsasada-talend@users.noreply.github.com>

* fix(TDI-50002):CVE snappy-java (#8972)

* fix(TDI-50002):CVE snappy-java

* fix mvn url

* fix(TDI-50099): add commons logging bridge S3 (#8986)

* Fix TUP-40043 Tacokit widget restore to editable if revert context
https://jira.talendforge.org/browse/TUP-40043

* Fix TUP-40043 Tacokit widget restore to editable if revert context
https://jira.talendforge.org/browse/TUP-40043

---------

Co-authored-by: hcyi <hcyi@talend.com>
Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
Co-authored-by: tsasada-talend <51699524+tsasada-talend@users.noreply.github.com>
Co-authored-by: pyzhou <pyzhou@talend.com>
Co-authored-by: Oleksandr Zhelezniak <66320870+ozhelezniak-talend@users.noreply.github.com>

* fix(TUP-39914):Database is empty when d&d Delta Lake and SingleStore as
tDBInput into job

* Fix table controller can't restore to editable if revert context
Improve query guess command

* fix(TUP-35088):fix a bug since rename jdbc components.

* TUP-40043 Tacokit widget can't restore to editable if revert context

* fix javajet after db uniform change which make component cid to tdbxxx

* TUP-40043 Tacokit widget can't restore to editable if revert context

* Fix can't retrieve table issue for the button beside Table field

* fix(TUP-40141):Snowflake node is not shown after importing

* Fix workday context issue

* feat(TUP-39967):"Query Type" and "Guess Query" for TCK JDBC

* TUP-40142 Tacokit JDBC - can not list connection parameters when export
as context using existed context
https://jira.talendforge.org/browse/TUP-40142

* feat(TUP-39073):[JDBC TCK]: reuse SQL builder when click button beside (#9068)

on "Query" field
https://jira.talendforge.org/browse/TUP-39073

* fix(TUP-40112):Add File/Directory widget for TCK components.

* fix(TUP-40144):new jdbc node is not shown in import wizard

* fix(TUP-40065):clean up all entrance of tcompv0 jdbc connector

* Fix TUP-39995 [bug] Guess schema fail for single store when use context
https://jira.talendforge.org/browse/TUP-39995

* Fix TUP-40124 TCK JDBC : list table do not work if use existing
connection
https://jira.talendforge.org/browse/TUP-40124

* Fix TUP-39944 [bug] Context can't load the correct driver class
https://jira.talendforge.org/browse/TUP-39944

* Fix TUP-39944 [bug] Context can't load the correct driver class
https://jira.talendforge.org/browse/TUP-39944

* Fix TUP-40197 [bug] select "Record type" failed after export to context
https://jira.talendforge.org/browse/TUP-40197

* Fix TUP-40197 [bug] select "Record type" failed after export to contexte

* Fix TUP-40124 TCK JDBC : list table do not work if use existing
connection

* TUP-40199 [bug] d&d netsuite from repository to job, can't load Version
and context not added also
https://jira.talendforge.org/browse/TUP-40199

* Fix TUP-40209 [bug] need remove Export to context for all tck dataset
https://jira.talendforge.org/browse/TUP-40209

* Update version for test

* support mapping file change apply

* Update for test

* fix(TUP-40230):[bug] isShow api return wrong result, that make code
generated wrong.

* add missing plugins

* fix(TUP-40060):[bug] Components list not correct when d&d SingleStore
connection/table into job

* fix(TUP-40212):[Bug] When drag jdbc metadata to job, there should be no
"tCreateTable" in component list.

* Fix TUP-39989 [bug] missing jar "mariadb-java-client" pop up when click
edit query button in job for singleStore context
https://jira.talendforge.org/browse/TUP-39989

* fix(TUP-40193):[Bug] Imported jdbc zip do not upgrade to the new tck
jdbc ok.

* Fix NPE error

* Fix TUP-40255 TCK JDBC connection when getName() is null
https://jira.talendforge.org/browse/TUP-40255

* TUP-40199 [bug] d&d netsuite from repository to job, can't load Version
and context not added also
https://jira.talendforge.org/browse/TUP-40199

* Fix TUP-40221 [bug] context not add into job when d&d dataset into job
https://jira.talendforge.org/browse/TUP-40221

* fix(TUP-39989):[bug] missing jar "mariadb-java-client" pop up when click (#9094)

fix(TUP-39989):[bug] missing jar "mariadb-java-client" pop up when click edit query button in job for singleStore context
null jar issue when not using context
https://jira.talendforge.org/browse/TUP-39989

* fix(TUP-40089):[bug] migration issue for stats&logs and Implicit
context.

* fix(TUP-40256):[bug] can not use unified tDBconnection and tDBClose for
Delta Lake and SingleSotre

* Fix TUP-40271
[JDBC TCK] tJDBCInput Guess query not escape for some DBs so job cannot
run
https://jira.talendforge.org/browse/TUP-40271

* Fix TUP-40224 [Bug]JDBC connection from 611 studio can not check pass
after import in lasted patch studio.

* schema guess issue fix

* allow set \r, \n and \r\n as parameter for tacokit

* fix(TUP-40282):tck jdbc components init failed in tuj

* fix(TUP-40287):should not show the cloud ui in studio.

* TUP-40296 The prompt function of JDBC connection not work
https://jira.talendforge.org/browse/TUP-40296

* fix(TUP-40256):[bug] can not use unified tDBconnection and tDBClose for
Delta Lake and SingleSotre

* fix(TUP-35447):[JDBC TCK]: Proxy not working when use guess schema.

* Fix junit error

* fix(TUP-40086):[bug] redundant page in jdbc creation wizard.

* Fix junit error

* build dist jar output

* Fix TUP-40306

[bug] after migrate, tjdbccomponent “auto commit” choice changed and run
job failed.

* fix(TUP-40192):[Bug] tJDBCinput>save the property to metadata can not
work.

* fix(TUP-40192):[Bug] tJDBCinput>save the property to metadata can not
work.

* fix(TUP-40316):[bug] schema of snowflake will not display under
snowflake node unless we do a refresh.

* Fix TUP-40372 [bug] ApacheKudu can't edit the parameter after revert
context

* Fix TUP-40371 [bug] ApacheKudu not change to context mode after the
metadata export to context in repository

* add dist jar

* Fix TUP-40383 [bug] context can't add for new created dataset after
export to context

* fix(TUP-40375):Additional jdbc components shouldn't be in the DND list
for JDBC metadata

* migration fix for tdeltalake and tsinglestore except tsinglestorebulk
components

* migration fix for tsinglestore bulk components

* fix(TUP-40410):[bug] Delta Lake and SingleStore can't select connection
when check "Use an existing connection"

* fix(TDI-50321): [JDBC TCK] tJDBCOutput Guess schema fail when there is
other subjob before output component and linked

* bug(TUP-40448):tJDBCConnection can't show 'Share DB connection name'
after checking 'Use or register a shared DB Connection'.

* fix(TDI-50384): The code generation of Table widget is wrong in the TCK
connectors

* fix(TDI-50289): schema change to build-in after migration

* fix(TDI-50394): [JDBC TCK] tSingleStoreInput cannot read data which just
load to server when running the whole job

* fix(TDI-50321): [JDBC TCK] tJDBCOutput Guess schema fail when there is
other subjob before output component and linked

* fix(TUP-40532):[JDBC TCK] Waring shown Schema`s DB type not correct
after importing old tujs

* more fix

* fix(TUP-40485):[JDBC TCK] No default parameter values for singlestore
and deltalake

* TUP-40566 TCK JDBC driver issue in context mode
https://jira.talendforge.org/browse/TUP-40566

* fix(TUP-40530):[JDBC TCK] Missing "Enable parallel execution" for
tDeltalakeOutput and tSingleStoreOutput.

* fix(TUP-40376):[JDBC TCK] Connection is missing when D&D SP to workspace

* Fix TUP-40293 [bug] Can't select table for some db after "import an
existing project"
https://jira.talendforge.org/browse/TUP-40293

* TUP-40566 TCK JDBC driver issue in context mode (Fix sql builder issue
with context) https://jira.talendforge.org/browse/TUP-40566

* fix(TUP-40485):[JDBC TCK] No default parameter values for singlestore
and deltalake

* Fix migration issue that resource was released

* Improve the code fix possible issue

* Fix TUP-40560 Only export simple fields with text controller to context
mode on TCK metadata
https://jira.talendforge.org/browse/TUP-40560

* fix(TCOMP-2552): support custom connection/close component icon for tck
connector in studio

* fix(TDI-50432): [JDBC TCK] The code generation of DB column is wrong for
JDBC TCK Connecotrs

* fix(TUP-40277):[Bug] tjdbcinput>component view: guess query type and
schema display issue.

* fix(TUP-40277):[Bug] tjdbcinput>component view: guess query type and
schema display issue.

* fix(TUP-40307):[bug] when export job, sap node and FakeGenericNode
display at the top of the repository list.

* fix(TDI-50433): [801 temp]Fail to send request to REST serivce with
tDBouput component

* Fix junit error part 1 (#9192)

* Fix junit error part 1

* feat(TUP-39073):[JDBC TCK]: reuse SQL builder when click button beside
on "Query" field
https://jira.talendforge.org/browse/TUP-39073

Co-authored-by: jding-tlnd <jding@talend.com>

* Fix a error

* fix(TUP-40657):Unable to import
BugTDI29716_tJDBCOutput_statusCatcherHung well.

* fix(TDI-50439): The code generation of the TCK connector's end part is
wrong if the TCK connector follows other Subjob with OnComponent* line

* fix(TDI-50432): [JDBC TCK] The code generation of DB column is wrong for
JDBC TCK Connecotrs

* Fix  TUP-40662 [Bug] NPE when click Edit queries for snowflake
connection
https://jira.talendforge.org/browse/TUP-40662

* fix(TUP-40396):[JDBC][TCK] If the JDBC component is dragged and dropped
from Metadata, the UI setting will be readonly after the first running

* fix(TUP-40616):[bug] "Update from repository connection" shows empty
filled parameters

* Fix TUP-40699 [bug] icon on import items pages not update
https://jira.talendforge.org/browse/TUP-40699

* fix(TUP-40616):[bug] "Update from repository connection" shows empty
filled parameters

* fix(TDI-50433): [801 temp]Fail to send request to REST serivce with
tDBouput component

* Revert "fix(TDI-50433): [801 temp]Fail to send request to REST serivce with tDBouput component"

This reverts commit e51f948146.

* fix(TDI-50459): [JDBC TCK]: Iterate line can't link to
tjdbcrow/tjdbcsp/tjdbccommit/tjdbcrollback/tjdbcclose components

* fix(TDI-50433): [801 temp]Fail to send request to REST serivce with
tDBouput component

---------

Co-authored-by: Zhiwei Xue <zwxue@talend.com>
Co-authored-by: Hongchun Yi <hcyi@talend.com>
Co-authored-by: Jane Ding <jding@talend.com>
Co-authored-by: wang wei <wwang@talend.com>
Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
Co-authored-by: tsasada-talend <51699524+tsasada-talend@users.noreply.github.com>
Co-authored-by: pyzhou <pyzhou@talend.com>
Co-authored-by: Oleksandr Zhelezniak <66320870+ozhelezniak-talend@users.noreply.github.com>
Co-authored-by: msjian <msjian@talend.com>
2023-11-02 17:58:08 +08:00
Jane Ding
3f1f9495a3 fix(TUP-36082):DetectCVE in Studio (#9170)
* fix(TUP-36082):DetectCVE in Studio
https://jira.talendforge.org/browse/TUP-36082

* fix(TUP-36082):DetectCVE in Studio
https://jira.talendforge.org/browse/TUP-36082

* fix(TUP-36082):DetectCVE in Studio
https://jira.talendforge.org/browse/TUP-36082

* fix(TUP-36082):DetectCVE in Studio
https://jira.talendforge.org/browse/TUP-36082

* fix(TUP-36082):DetectCVE in Studio
https://jira.talendforge.org/browse/TUP-36082

* fix(TUP-36082):DetectCVE in Studio
https://jira.talendforge.org/browse/TUP-36082

* fix(TUP-36082):DetectCVE in Studio
https://jira.talendforge.org/browse/TUP-36082
2023-11-02 17:54:01 +08:00
pyzhou
06c87d8edf feat(TDI-49973):tSchemaCompliance check string by byte length (#9140)
* feat(TDI-49973):tSchemaCompliance check string by byte length

* remove useless code
2023-10-30 16:37:06 +08:00
jzhao
f3f79aea29 fix(TDI-50291):tCyberarkInput output line optional (#9157) 2023-10-30 09:15:18 +08:00
Jane Ding
8640719bd5 Add localized files (#9198)
* Add localized files (#9197)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

* Add localized files (#9196)

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

---------

Co-authored-by: Alexiane Yvonet <ayvonet@talend.com>
Co-authored-by: build-talend-doc <build-talend-doc@talend.com>
2023-10-26 17:02:21 +08:00
Oleksandr Zhelezniak
2c1e96eca2 fix(TDI-50379): VerifyError with GoogleCredentials (#9159) 2023-10-26 10:55:47 +03:00
Oleksandr Zhelezniak
0013730512 fix(TDI-50347): tPop perf improvement (#9135)
* use bufferedOutputStream before writing into the file
2023-10-26 10:48:45 +03:00
zshen-talend
735e374149 fix(TBD-15665): make sure tHadoopConfManager support with java 11 (#9180) 2023-10-25 10:34:22 +08:00
Jane Ding
8415bd7cc9 fix(TUP-40295):Testcases with resource contexts fail when building job (#9145)
* fix(TUP-40295):Testcases with resource contexts fail when building job
in Studio
https://jira.talendforge.org/browse/TUP-40295

* fix(TUP-40295):Testcases with resource contexts fail when building job
in Studio
https://jira.talendforge.org/browse/TUP-40295
2023-10-24 19:29:36 +08:00
737 changed files with 11024 additions and 12780 deletions

View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.talend.studio.components.tck.jdbc.feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>

View File

@@ -0,0 +1 @@
bin.includes = feature.xml

View File

@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.talend.studio.components.tck.jdbc.feature"
label="JDBC"
version="8.0.1.qualifier">
<description url="http://www.example.com/description">
JDBC
</description>
<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>
<license url="http://www.example.com/license">
JDBC
Copyright (c) 2006-2021 Talend Inc. - www.talend.com
All rights reserved.
This product includes software developed at
GlassFish Community (https://glassfish.dev.java.net)
Licensed under the CDDL,GPL-2.0-only license.
This product includes software developed at
The Apache Software Foundation (http://jakarta.apache.org/)
Licensed under the Apache-2.0 license.
This product includes software developed at
FasterXML
Licensed under the Apache-2.0 license.
</license>
<requires>
<import plugin="org.talend.designer.maven.repo.tck"/>
<import plugin="org.talend.studio.components.tck.jdbc"/>
<import plugin="org.talend.components.jdbc.definition"/>
</requires>
</feature>

View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.studio.components.tck.jdbc.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -15,17 +15,5 @@
<license url="http://www.example.com/license">
[Enter License Description here.]
</license>
<plugin
id="org.talend.studio.components.tcompv0.jdbc"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.talend.components.jdbc.definition"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

View File

@@ -19,7 +19,6 @@
<requires>
<import feature="org.talend.studio.components.tck.jira.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.studio.components.tck.splunk.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.studio.components.tcompv0.jdbc.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.studio.components.tcompv0.netsuite.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.studio.components.tcompv0.googledrive.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.studio.components.tcompv0.marketo.feature" version="0.0.0" match="greaterOrEqual"/>
@@ -158,7 +157,7 @@
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.designer.filemultischemas"
download-size="0"
@@ -242,12 +241,18 @@
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
<plugin
id="org.talend.designer.esb.components.rs.consumer"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.studio.components.tck.jdbc"
download-size="0"
install-size="0"
version="0.0.0"/>
</feature>

View File

@@ -87,12 +87,12 @@
"tIngresConnection",
"tInterbaseConnection",
"tJDBCConnection",
"JDBCConnection",
"tMSSqlConnection",
"tMysqlConnection",
"tNetezzaConnection",
"tOracleConnection",
"tParAccelConnection",
"tPostgresPlusConnection",
"tPostgresqlConnection",
"tRedshiftConnection",
"tSQLiteConnection",

View File

@@ -224,7 +224,7 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
<% if (column.getOriginalDbColumnName() == null) { %>
return null;
<% } else { %>
return "<%=TalendTextUtils.escapeJavaText(TalendTextUtils.removeQuotes(column.getOriginalDbColumnName()))%>";
return "<%=TalendTextUtils.escapeJavaText(column.getOriginalDbColumnName())%>";
<% } %>
}

View File

@@ -126,7 +126,7 @@ FAMILY.MySQL=MySQL
FAMILY.Netezza=Netezza
FAMILY.OLAP_Cube=OLAP\u30AD\u30E5\u30FC\u30D6
FAMILY.Oracle=Oracle
FAMILY.Orchestration=\u30D7\u30ED\u30BB\u30B9\u5236\u5FA1
FAMILY.Orchestration=\u30AA\u30FC\u30B1\u30B9\u30C8\u30EC\u30FC\u30B7\u30E7\u30F3\u5316
FAMILY.Output=\u51FA\u529B
FAMILY.ParAccel=ParAccel
FAMILY.PostgreSQL=PostgreSQL

View File

@@ -599,6 +599,13 @@ public class CodeGenerator implements ICodeGenerator {
} else {
// if (!isIterate) {
if (isTacokitProcessor(node)) {
codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_RECORDS_END, incomingName, typeGen));
codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_BEGIN, incomingName, typeGen));
codeComponent.append(generatesTreeCode(subProcess, node, ECodePart.MAIN, typeGen));
codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_END, incomingName, typeGen));
}
codeComponent.append(generateComponentCode(subProcess, node, ECodePart.END, incomingName, typeGen));
// }
if (node.getComponent() instanceof Component) {
@@ -629,12 +636,6 @@ public class CodeGenerator implements ICodeGenerator {
}
}
if (isTacokitProcessor(node)) {
codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_RECORDS_END, incomingName, typeGen));
codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_BEGIN, incomingName, typeGen));
codeComponent.append(generatesTreeCode(subProcess, node, ECodePart.MAIN, typeGen));
codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_END, incomingName, typeGen));
}
codeComponent.append(generatesTreeCode(subProcess, node, part, typeGen));
// if (isIterate) {
// codeComponent.append(generateComponentCode(node,
@@ -655,11 +656,14 @@ public class CodeGenerator implements ICodeGenerator {
return codeComponent;
}
private static final String TACOKIT_PROCESSOR_CODE_DIR = "tacokit/jet_stub/generic/processor";
private boolean isTacokitProcessor(final INode node) {
return "org.talend.sdk.component.studio.ComponentModel".equals(node.getComponent().getClass().getName())
&& !NodeUtil.getIncomingConnections(node, IConnectionCategory.DATA).isEmpty(); //has input data
final String componentModelClass = node.getComponent().getClass().getName();
return ("org.talend.sdk.component.studio.ComponentModel".equals(componentModelClass) || "org.talend.sdk.component.studio.AdditionalJDBCComponentModel".equals(componentModelClass))
&& (!NodeUtil.getIncomingConnections(node, IConnectionCategory.DATA).isEmpty() || TACOKIT_PROCESSOR_CODE_DIR.equals(node.getComponent().getTemplateFolder()));
}
private StringBuffer generateSeperateEndCode(NodesSubTree subProcess, INode node, String incomingName, ETypeGen typeGen)
throws CodeGeneratorException {
StringBuffer codeComponent = new StringBuffer();

View File

@@ -59,7 +59,9 @@ import org.talend.core.model.components.IComponentsFactory;
import org.talend.core.model.components.IComponentsHandler;
import org.talend.core.model.components.filters.ComponentsFactoryProviderManager;
import org.talend.core.model.components.filters.IComponentFactoryFilter;
import org.talend.core.runtime.services.IGenericService;
import org.talend.core.runtime.util.ComponentsLocationProvider;
import org.talend.core.service.ITCKUIService;
import org.talend.core.ui.IJobletProviderService;
import org.talend.core.ui.ISparkJobletProviderService;
import org.talend.core.ui.ISparkStreamingJobletProviderService;
@@ -73,6 +75,7 @@ import org.talend.designer.core.model.components.EmfComponent;
import org.talend.designer.core.model.process.AbstractProcessProvider;
import org.talend.designer.core.model.process.GenericProcessProvider;
import org.talend.designer.core.ui.editor.jobletcontainer.JobletUtil;
import org.talend.designer.core.utils.UnifiedComponentUtil;
/**
* Component factory that look for each component and load their information. <br/>
@@ -231,7 +234,15 @@ public class ComponentsFactory implements IComponentsFactory {
if (StringUtils.isEmpty(componentName)) {
continue;
}
if (IGenericService.getService().isTcompv0(component)
&& (UnifiedComponentUtil.isAdditionalJDBCComponent(component.getName())
|| component.getName().contains(ITCKUIService.get().getTCKJDBCType().getLabel()))) {
continue;
}
String componentNameLowerCase = componentName.toLowerCase();
if (componentNameLowerCase.startsWith(ITCKUIService.get().getTCKJDBCType().getLabel().toLowerCase())) {
componentNameLowerCase = "t" + componentNameLowerCase;
}
Map<String, Set<IComponent>> map = componentNameMap.get(componentNameLowerCase);
if (map == null) {
map = new HashMap<String, Set<IComponent>>();

View File

@@ -378,7 +378,7 @@ public class TalendJetEmitter extends JETEmitter {
// Construct a proper URL for relative lookup.
//
URL url = new File(project.getLocation() + "/" + "runtime" + "/") //$NON-NLS-1$ //$NON-NLS-2$
.toURL();
.toURI().toURL();
URLClassLoader theClassLoader = new URLClassLoader(new URL[] { url }, jetEmitter.classLoader);
Class theClass = theClassLoader.loadClass((packageName.length() == 0 ? "" : packageName + ".") //$NON-NLS-1$ //$NON-NLS-2$
+ jetCompiler.getSkeleton().getClassName());
@@ -633,7 +633,7 @@ public class TalendJetEmitter extends JETEmitter {
final IWorkspace workspace = ResourcesPlugin.getWorkspace();
IProject project = workspace.getRoot().getProject(projectName);
URL url = new File(project.getLocation() + "/runtime").toURL(); //$NON-NLS-1$
URL url = new File(project.getLocation() + "/runtime").toURI().toURL(); //$NON-NLS-1$
currentClassLoader = jetbean.getClassLoader();
theClassLoader = new URLClassLoader(new URL[] { url }, jetbean.getClassLoader());
}

View File

@@ -38,9 +38,7 @@ import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.osgi.framework.Bundle;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.commons.runtime.utils.io.IOUtils;
import org.talend.core.model.components.ComponentCompilations;
@@ -138,9 +136,6 @@ public final class JetSkeletonManager {
}
project.open(new NullProgressMonitor());
IFile file = project.getFile("SkeletonUpdateCache"); //$NON-NLS-1$
if (!file.exists()) {
file.create(null, true, new NullProgressMonitor());
}
return file.getLocation().toFile();
}

View File

@@ -16,8 +16,8 @@
<pathelement location="${component.plugin.home}/tWebServiceInput/axis.jar" />
<pathelement location="${component.plugin.home}/tWebServiceInput/commons-discovery-0.2.jar" />
<pathelement location="${component.plugin.home}/tWebServiceInput/wsdl4j-1.5.1.jar" />
<pathelement location="${component.plugin.home}/tWebServiceInput/saaj.jar" />
<pathelement location="${component.plugin.home}/tWebServiceInput/jaxrpc.jar" />
<pathelement location="${component.plugin.home}/tWebServiceInput/axis-saaj-1.4.jar" />
<pathelement location="${component.plugin.home}/tWebServiceInput/axis-jaxrpc-1.4.jar" />
<pathelement location="${component.plugin.home}/tXMLRPCInput/commons-logging-1.1.jar" />
</path>

View File

@@ -25,7 +25,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20230227</version>
<version>20231013</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>

View File

@@ -17,7 +17,7 @@
<pathelement location="${component.plugin.home}/tMomInput/activemq-all-5.1.0.jar" />
<pathelement location="${component.plugin.home}/tMomInput/jnp-client.jar" />
<pathelement location="${component.plugin.home}/tMomInput/websphere-connector-1_5.jar" />
<pathelement location="${component.plugin.home}/tMomInput/trove.jar" />
<pathelement location="${component.plugin.home}/tMomInput/trove-1.0.2.jar" />
<pathelement location="${component.plugin.home}/tMomInput/log4j-1.2.13.jar" />
</path>

View File

@@ -1,135 +0,0 @@
<!--
Copyright (C) 2006-2021 Talend Inc. - www.talend.com
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<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>components-servicenow</artifactId>
<name>servicenow</name>
<version>1.0.1-20210428</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
<httpcore.version>4.4.13</httpcore.version>
<httpclient.version>4.5.13</httpclient.version>
<httpclient-cache.version>4.5.13</httpclient-cache.version>
<httpmime.version>4.5.13</httpmime.version>
<junit.version>4.13.2</junit.version>
<commons-codec.version>1.14</commons-codec.version>
<commons-logging.version>1.1.3</commons-logging.version>
</properties>
<description>Talend Helper library for ServiceNow components</description>
<url>
https://github.com/Talend/tdi-studio-se/
</url>
<licenses>
<license>
<name>Apache-2.0</name>
<url>
http://www.talendforge.org/modules/licenses/APACHE_v2.txt
</url>
</license>
</licenses>
<dependencies>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
<version>${httpclient-cache.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>${httpmime.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>${httpcore.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20230227</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<type>jar</type>
<scope>test</scope>
<optional>true</optional>
</dependency>
</dependencies>
<distributionManagement>
<snapshotRepository>
<id>talend_nexus_deployment</id>
<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
</snapshotRepository>
<repository>
<id>talend_nexus_deployment</id>
<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
</repository>
</distributionManagement>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/java</directory>
</resource>
</resources>
</build>
</project>

View File

@@ -1,269 +0,0 @@
/**
* Copyright (C) 2006-2021 Talend Inc. - www.talend.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.talend.servicenow;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import org.apache.http.HttpResponse;
import org.apache.http.ParseException;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
public class Util {
private HttpClient client;
private String baseurl;
public Util(HttpClient client, String baseurl) {
this.client = client;
this.baseurl = baseurl;
}
private Map<String, String> typeMapping = new HashMap<String, String>();
{
typeMapping.put("string", "id_String");
typeMapping.put("boolean", "id_Boolean");
typeMapping.put("integer", "id_Integer");
typeMapping.put("decimal", "id_BigDecimal");
typeMapping.put("float", "id_Float");
typeMapping.put("glide_date_time", "id_Date");
typeMapping.put("glide_date", "id_Date");
typeMapping.put("glide_time", "id_Date");
}
public static class ColumnMetadata {
private String name;
private String type;
private int maxlength;
private String pattern;
public ColumnMetadata(String name, String type, int maxlength, String pattern) {
this.name = name;
this.type = type;
this.maxlength = maxlength;
this.pattern = pattern;
}
public String getName() {
return name;
}
public String getType() {
return type;
}
public int getMaxLength() {
return maxlength;
}
public String getPattern() {
return pattern;
}
public String toString() {
return name + ":" + type + ":" + maxlength;
}
}
public Map<String, ColumnMetadata> getMetadata(String tablename) throws ClientProtocolException, IOException {
Map<String, ColumnMetadata> result = new HashMap<String, ColumnMetadata>();
List<String> relation = getRelationship(tablename);
StringBuilder sb = new StringBuilder();
for (String tname : relation) {
sb.setLength(0);
sb.append(this.baseurl);
sb.append("/api/now/table/");
sb.append("sys_dictionary");
sb.append("?sysparm_exclude_reference_link=true");
sb.append("&sysparm_query=name=");
sb.append(tname);
sb.append("&sysparm_fields=element,internal_type,max_length,active");
HttpGet httpget = new HttpGet(sb.toString());
httpget.setHeader("Accept", "application/json");
HttpResponse response = this.client.execute(httpget);
List<Map<String, String>> info = extractResponse4MultiRowFromArray(response);
for (Map<String, String> row : info) {
String element = row.get("element");
boolean active = Boolean.parseBoolean(row.get("active"));
if (element != null && !element.isEmpty() && active) {
String talend_type = null;
String pattern = null;
String servicenow_type = (String) row.get("internal_type");
if (servicenow_type != null && !servicenow_type.isEmpty()) {
talend_type = typeMapping.get(servicenow_type);
//need date pattern
if ("glide_date_time".equals(servicenow_type)) {
pattern = "yyyy-MM-dd HH:mm:ss";
} else if ("glide_date".equals(servicenow_type)) {
pattern = "yyyy-MM-dd";
} else if ("glide_time".equals(servicenow_type)) {
pattern = "HH:mm:ss";
}
}
if (talend_type == null) {
talend_type = "id_String";
}
int mlength = 64;
String maxlength = (String) row.get("max_length");
if (maxlength != null && !maxlength.isEmpty()) {
mlength = Integer.parseInt(maxlength);
}
ColumnMetadata column = new ColumnMetadata(element, talend_type, mlength, pattern);
result.put(element, column);
}
}
}
return result;
}
private List<String> getRelationship(String tablename) throws ClientProtocolException, IOException {
LinkedList<String> result = new LinkedList<String>();
StringBuilder sb = new StringBuilder();
sb.append(this.baseurl);
sb.append("/api/now/table/");
sb.append("sys_db_object");
sb.append("?sysparm_exclude_reference_link=true");
sb.append("&sysparm_query=name=");
sb.append(tablename);
sb.append("&sysparm_fields=name,super_class");
HttpGet httpget = new HttpGet(sb.toString());
httpget.setHeader("Accept", "application/json");
HttpResponse response = this.client.execute(httpget);
Map<String, String> info = extractResponse4OneRowFromArray(response);
result.add(info.get("name"));
String superclass = info.get("super_class");
while (superclass != null && !superclass.isEmpty()) {
sb.setLength(0);
sb.append(this.baseurl);
sb.append("/api/now/table/");
sb.append("sys_db_object/");
sb.append(superclass);
sb.append("?sysparm_exclude_reference_link=true");
sb.append("&sysparm_fields=name,super_class");
httpget = new HttpGet(sb.toString());
httpget.setHeader("Accept", "application/json");
response = this.client.execute(httpget);
info = extractResponse4OneRowFromObject(response);
result.add(info.get("name"));
superclass = info.get("super_class");
}
Collections.reverse(result);
return result;
}
private Map<String, String> extractResponse4OneRowFromArray(HttpResponse response)
throws ParseException, IOException {
validateResponse(response);
Map<String, String> result = new HashMap<String, String>();
org.json.JSONArray array = (org.json.JSONArray) getResult(response);
for (int i = 0; i < array.length(); i++) {
org.json.JSONObject row = (org.json.JSONObject) array.get(i);
for (String key : row.keySet()) {
result.put(key, (String) row.get(key));
}
}
return result;
}
private Map<String, String> extractResponse4OneRowFromObject(HttpResponse response)
throws ParseException, IOException {
validateResponse(response);
Map<String, String> result = new HashMap<String, String>();
org.json.JSONObject object = (org.json.JSONObject) getResult(response);
for (String key : object.keySet()) {
result.put(key, (String) object.get(key));
}
return result;
}
private List<Map<String, String>> extractResponse4MultiRowFromArray(HttpResponse response)
throws ParseException, IOException {
validateResponse(response);
List<Map<String, String>> result = new ArrayList<Map<String, String>>();
org.json.JSONArray array = (org.json.JSONArray) getResult(response);
for (int i = 0; i < array.length(); i++) {
Map<String, String> element = new HashMap<String, String>();
org.json.JSONObject row = (org.json.JSONObject) array.get(i);
for (String key : row.keySet()) {
element.put(key, (String) row.get(key));
}
result.add(element);
}
return result;
}
private void validateResponse(HttpResponse response) {
if (response.getStatusLine().getStatusCode() != 200) {
throw new RuntimeException(
"Fail to get the table metadata. The operation has returned the code : " + response.getStatusLine()
+ ".");
}
}
private Object getResult(HttpResponse response) throws ParseException, IOException {
String responseBody = org.apache.http.util.EntityUtils.toString(response.getEntity());
org.json.JSONObject json = new org.json.JSONObject(responseBody);
return json.get("result");
}
}

View File

@@ -16,8 +16,8 @@
<pathelement location="${component.plugin.home}/tWebServiceInput/axis.jar" />
<pathelement location="${component.plugin.home}/tWebServiceInput/commons-discovery-0.2.jar" />
<pathelement location="${component.plugin.home}/tWebServiceInput/wsdl4j-1.5.1.jar" />
<pathelement location="${component.plugin.home}/tWebServiceInput/saaj.jar" />
<pathelement location="${component.plugin.home}/tWebServiceInput/jaxrpc.jar" />
<pathelement location="${component.plugin.home}/tWebServiceInput/axis-saaj-1.4.jar" />
<pathelement location="${component.plugin.home}/tWebServiceInput/axis-jaxrpc-1.4.jar" />
<pathelement location="${component.plugin.home}/tXMLRPCInput/commons-logging-1.1.jar" />
</path>

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.components</groupId>
<artifactId>talendssl</artifactId>
<version>1.0-20190118</version>
<version>1.0-20231128</version>
<packaging>jar</packaging>
<properties>
@@ -52,4 +52,4 @@
</plugin>
</plugins>
</build>
</project>
</project>

View File

@@ -103,7 +103,11 @@ public class Truster implements X509TrustManager {
} catch (IOException _ex) {
}
try {
ks.load(in, certStorePwd);
if (in == null) {
ks = null;
} else {
ks.load(in, certStorePwd);
}
} catch (Exception e) {
System.err.println("ASF Truster: Failed to load the cert store : " + e.getMessage());
return;

View File

@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Components Local provider Plug-in
Bundle-Name: Components Local provider Plug-in R2023-12
Bundle-SymbolicName: org.talend.designer.components.localprovider;singleton:=true
Bundle-Version: 8.0.1.qualifier
Bundle-Activator: org.talend.designer.components.ComponentsLocalProviderPlugin

View File

@@ -16,12 +16,12 @@ bin.excludes = components/tAlfrescoOutput/wstx-lgpl-3.2.7.jar,\
components/tNamedPipeOutput/namedpipe_jni_64bit.dll,\
components/tNetezzaNzLoad/namedpipe_jni_64bit.dll,\
components/tGreenplumGPLoad/namedpipe-1.0.jar,\
components/tRSSInput/nekohtml.jar,\
components/tRSSInput/nekohtml-0.9.5.jar,\
components/tAlfrescoOutput/wstx-lgpl-3.2.7.jar,\
components/tAdvancedXMLMapHash/trove.jar,\
components/tAdvancedXMLMapHash/trove-1.0.2.jar,\
components/tLineChart/jcommon-1.0.6.jar,\
components/tMomInput/jnp-client.jar,\
components/tMomInput/javassist.jar,\
components/tMomInput/javassist-3.10.0.GA.jar,\
components/tBonitaDeploy/cglib-nodep-2.1_3.jar,\
components/tBonitaDeploy/javassist-3.12.0.GA.jar,\
components/tBonitaDeploy/javassist-3.8.0.GA.jar,\

View File

@@ -35,7 +35,7 @@ SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=Bool\u00E9en
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=Octet
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Bytes
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Octets
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=Date
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=Double

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.70" MODULE="bcprov-jdk15on-1.70.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.70" REQUIRED="true"/>
<IMPORT NAME="bcprov-jdk18on-1.74" MODULE="bcprov-jdk18on-1.74.jar" MVN="mvn:org.bouncycastle/bcprov-jdk18on/1.74" 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.70" MODULE="bcprov-jdk15on-1.70.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.70" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="bcprov-jdk18on-1.74" MODULE="bcprov-jdk18on-1.74.jar" MVN="mvn:org.bouncycastle/bcprov-jdk18on/1.74" 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.70" MODULE="bcprov-jdk15on-1.70.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.70" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="bcprov-jdk18on-1.74" MODULE="bcprov-jdk18on-1.74.jar" MVN="mvn:org.bouncycastle/bcprov-jdk18on/1.74" 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

@@ -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.70" MODULE="bcprov-jdk15on-1.70.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.70" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
<IMPORT NAME="bcprov-jdk18on-1.74" MODULE="bcprov-jdk18on-1.74.jar" MVN="mvn:org.bouncycastle/bcprov-jdk18on/1.74" 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

@@ -28,7 +28,7 @@ SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=Bool\u00E9en
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=Octet
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Bytes
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Octets
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=Date
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=Double

View File

@@ -46,7 +46,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Advanced_Persistent_Lookup" MODULE="advancedPersistentLookupLib-1.5.jar" MVN="mvn:org.talend.libraries/advancedPersistentLookupLib/1.5" UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.5.jar" REQUIRED="true"/>
<IMPORT NAME="Advanced_Persistent_Lookup" MODULE="advancedPersistentLookupLib-1.5.jar" MVN="mvn:org.talend.components.lib/advancedPersistentLookupLib/1.5/jar" UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.5.jar" REQUIRED="true"/>
<IMPORT NAME="ApacheCommonsCollection32" MODULE="commons-collections-3.2.2.jar" MVN="mvn:commons-collections/commons-collections/3.2.2" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-3.2.2.jar" REQUIRED="true" BundleID=""/>
<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"/>

View File

@@ -47,8 +47,8 @@
<IMPORTS>
<IMPORT
NAME="Advanced_Persistent_Lookup"
MODULE="advancedPersistentLookupLib-1.5.jar" MVN="mvn:org.talend.libraries/advancedPersistentLookupLib/1.5"
UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.5.jar"
MODULE="advancedPersistentLookupLib-1.5.jar" MVN="mvn:org.talend.components.lib/advancedPersistentLookupLib/1.5/jar"
UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.5.jar"
REQUIRED="true"
/>
<IMPORT

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=\u30B0\u30EB\u30FC\u30D7\u57FA\u6E96:
HELP=org.talend.help.tAggregateRowOptOut
LIST_DELIMITER.NAME=\u533A\u5207\u308A(\u30EA\u30B9\u30C8\u64CD\u4F5C\u5C02\u7528)
LIST_DELIMITER.NAME=\u533A\u5207\u308A(\u64CD\u4F5C\u30EA\u30B9\u30C8\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(\u9045\u3044)
CHECK_ULP.NAME=ULP (Unit in the Last Place)\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=\u30B0\u30EB\u30FC\u30D7\u57FA\u6E96:
HELP=org.talend.help.tAggregateOut
LIST_DELIMITER.NAME=\u533A\u5207\u308A(\u30EA\u30B9\u30C8\u64CD\u4F5C\u5C02\u7528)
LIST_DELIMITER.NAME=\u533A\u5207\u308A(\u64CD\u4F5C\u30EA\u30B9\u30C8\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(\u9045\u3044)
CHECK_ULP.NAME=ULP (Unit in the Last Place)\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=\u30B0\u30EB\u30FC\u30D7\u57FA\u6E96:
HELP=org.talend.help.tAggregateRow
LIST_DELIMITER.NAME=\u533A\u5207\u308A(\u30EA\u30B9\u30C8\u64CD\u4F5C\u5C02\u7528)
LIST_DELIMITER.NAME=\u533A\u5207\u308A(\u64CD\u4F5C\u30EA\u30B9\u30C8\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(\u9045\u3044)
CHECK_ULP.NAME=ULP (Unit in the Last Place)\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

@@ -46,7 +46,7 @@ SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=Bool\u00E9en
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=Octet
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Bytes
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Octets
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=Date
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=Double

View File

@@ -163,7 +163,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-MysqlConnector" MODULE="mysql-connector-java-5.1.49.jar" MVN="mvn:mysql/mysql-connector-java/5.1.49" REQUIRED_IF="DB_VERSION == 'MYSQL_5'" />
<IMPORT NAME="Driver-MysqlConnector_Old" MODULE="mysql-connector-java-5.1.0-bin.jar" MVN="mvn:org.talend.libraries/mysql-connector-java-5.1.0-bin/6.0.0" REQUIRED="false" />
<IMPORT NAME="Driver-MysqlConnector_Old" MODULE="mysql-connector-java-5.1.13.jar" MVN="mvn:mysql/mysql-connector-java/5.1.13" REQUIRED="false" />
<IMPORT NAME="slf4j-api-1.7.34.jar" MODULE="slf4j-api-1.7.34.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.34" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
<IMPORT NAME="slf4j-reload4j-1.7.34.jar" MODULE="slf4j-reload4j-1.7.34.jar" MVN="mvn:org.slf4j/slf4j-reload4j/1.7.34" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
</IMPORTS>

View File

@@ -47,7 +47,7 @@ SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=Bool\u00E9en
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=Octet
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Bytes
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Octets
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=Date
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=Double

View File

@@ -242,7 +242,7 @@
<IMPORT NAME="TNS" MODULE="tns.jar" MVN="mvn:org.talend.libraries/tns/6.0.0" REQUIRED="true" />
<IMPORT NAME="ORACLE_18" MODULE="ojdbc8-19.19.0.0.jar" MVN="mvn:com.oracle.database.jdbc/ojdbc8/19.19.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_18')" />
<IMPORT NAME="Driver-Ojdbc7" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_12')" />
<IMPORT NAME="Driver-Ojdbc6" MODULE="ojdbc6.jar" MVN="mvn:org.talend.libraries/ojdbc6/6.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_11')" />
<IMPORT NAME="Driver-Ojdbc6" MODULE="ojdbc6-11.2.0.4.jar" MVN="mvn:com.oracle.database.jdbc/ojdbc6/11.2.0.4" REQUIRED_IF="(DB_VERSION == 'ORACLE_11')" />
<IMPORT NAME="slf4j-api-1.7.34.jar" MODULE="slf4j-api-1.7.34.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.34" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
<IMPORT NAME="slf4j-reload4j-1.7.34.jar" MODULE="slf4j-reload4j-1.7.34.jar" MVN="mvn:org.slf4j/slf4j-reload4j/1.7.34" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
</IMPORTS>

View File

@@ -167,7 +167,7 @@
</ADVANCED_PARAMETERS>
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Oracle11" MODULE="ojdbc6.jar" MVN="mvn:org.talend.libraries/ojdbc6/6.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_11') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Oracle11" MODULE="ojdbc6-11.2.0.4.jar" MVN="mvn:com.oracle.database.jdbc/ojdbc6/11.2.0.4" REQUIRED_IF="(DB_VERSION == 'ORACLE_11') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Oracle-XDB" MODULE="xdb.jar" MVN="mvn:org.talend.libraries/xdb/6.0.0" REQUIRED_IF="SCHEMA.DB_TYPE IN ['XMLTYPE']" />
<IMPORT NAME="Driver-Oracle-XMLPARSERV2" BundleID="" MODULE="xmlparserv2.jar" MVN="mvn:org.talend.libraries/xmlparserv2/6.0.0" REQUIRED_IF="SCHEMA.DB_TYPE IN ['XMLTYPE']" />
<IMPORT NAME="Driver-Oracle12c" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_12') AND (USE_EXISTING_CONNECTION == 'false')" />

View File

@@ -459,7 +459,7 @@
<IMPORT NAME="Driver-Oracle-XMLPARSERV2" BundleID="" MODULE="xmlparserv2.jar" MVN="mvn:org.talend.libraries/xmlparserv2/6.0.0" REQUIRED_IF="SCHEMA.DB_TYPE IN ['XMLTYPE']" />
<IMPORT NAME="ORACLE_18" MODULE="ojdbc8-19.19.0.0.jar" MVN="mvn:com.oracle.database.jdbc/ojdbc8/19.19.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_18') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Ojdbc7" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_12') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Ojdbc6" MODULE="ojdbc6.jar" MVN="mvn:org.talend.libraries/ojdbc6/6.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_11') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Ojdbc6" MODULE="ojdbc6-11.2.0.4.jar" MVN="mvn:com.oracle.database.jdbc/ojdbc6/11.2.0.4" REQUIRED_IF="(DB_VERSION == 'ORACLE_11') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -341,7 +341,7 @@
<IMPORTS>
<IMPORT NAME="Driver-OjdbcConnector8" MODULE="ojdbc8-19.19.0.0.jar" MVN="mvn:com.oracle.database.jdbc/ojdbc8/19.19.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_18') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-OjdbcConnector7" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_12') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-OjdbcConnector6" MODULE="ojdbc6.jar" MVN="mvn:org.talend.libraries/ojdbc6/6.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_11') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-OjdbcConnector6" MODULE="ojdbc6-11.2.0.4.jar" MVN="mvn:com.oracle.database.jdbc/ojdbc6/11.2.0.4" REQUIRED_IF="(DB_VERSION == 'ORACLE_11') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -52,7 +52,7 @@ SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=Bool\u00E9en
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=Octet
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Bytes
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Octets
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=Date
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=Double

View File

@@ -39,7 +39,7 @@ SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=Bool\u00E9en
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=Octet
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Bytes
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Octets
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=Date
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=Double

View File

@@ -87,8 +87,8 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="JFreeChart" MODULE="jfreechart-1.0.3.jar" MVN="mvn:org.talend.libraries/jfreechart-1.0.3/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.jfreechart/lib/jfreechart-1.0.3.jar" REQUIRED="true"/>
<IMPORT NAME="JCommon" MODULE="jcommon-1.0.6.jar" MVN="mvn:org.talend.libraries/jcommon-1.0.6/6.0.0" REQUIRED="true"/>
<IMPORT NAME="JFreeChart" MODULE="jfreechart-1.0.3.jar" MVN="mvn:jfree/jfreechart/1.0.3" UrlPath="platform:/plugin/org.talend.libraries.jfreechart/lib/jfreechart-1.0.3.jar" REQUIRED="true"/>
<IMPORT NAME="JCommon" MODULE="jcommon-1.0.6.jar" MVN="mvn:jfree/jcommon/1.0.6" REQUIRED="true"/>
</IMPORTS>
</CODEGENERATION>

View File

@@ -197,21 +197,30 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
/* ----END-CREATING-CLIENT (OAuth 2.0)---- */
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
/* ----START-CREATING-CLIENT (Cloud API)---- */
<% // Fix verifyError for a huge file TDI-50379 %>
class BigQueryBuilder_<%=cid%> {
public com.google.cloud.bigquery.BigQuery newBigQuery() throws java.io.IOException {
com.google.auth.oauth2.GoogleCredentials credentials_<%=cid%>;
<%if ("APPLICATION_DEFAULT_CREDENTIALS".equals(authMode)) { %>
credentials_<%=cid%> = com.google.auth.oauth2.GoogleCredentials.getApplicationDefault();
<%} else { %>
java.io.File credentialsFile_<%=cid%> = new java.io.File(<%=credentialsFile%>);
try(java.io.FileInputStream credentialsStream_<%=cid%> = new java.io.FileInputStream(credentialsFile_<%=cid%>)) {
credentials_<%=cid%> = com.google.auth.oauth2.ServiceAccountCredentials.fromStream(credentialsStream_<%=cid%>);
}
<%}%>
com.google.auth.oauth2.GoogleCredentials credentials_<%=cid%>;
java.io.File credentialsFile_<%=cid%> = new java.io.File(<%=credentialsFile%>);
try(java.io.FileInputStream credentialsStream_<%=cid%> = new java.io.FileInputStream(credentialsFile_<%=cid%>)) {
credentials_<%=cid%> = com.google.auth.oauth2.ServiceAccountCredentials.fromStream(credentialsStream_<%=cid%>);
com.google.cloud.bigquery.BigQueryOptions.Builder bigQueryOptionsBuilder_<%=cid%> = com.google.cloud.bigquery.BigQueryOptions.newBuilder().setCredentials(credentials_<%=cid%>).setProjectId(<%=projectId%>);
<% if( "true".equals(ElementParameterParser.getValue(node, "__USE_REGION_ENDPOINT__")) ){ %>
bigQueryOptionsBuilder_<%=cid%>.setHost( <%= ElementParameterParser.getValue(node, "__REGION_ENDPOINT_BQ__")%> );
<% } %>
return bigQueryOptionsBuilder_<%=cid%>.build().getService();
}
}
com.google.cloud.bigquery.BigQueryOptions.Builder bigQueryOptionsBuilder_<%=cid%> = com.google.cloud.bigquery.BigQueryOptions.newBuilder().setCredentials(credentials_<%=cid%>).setProjectId(<%=projectId%>);
<% if( "true".equals(ElementParameterParser.getValue(node, "__USE_REGION_ENDPOINT__")) ){ %>
bigQueryOptionsBuilder_<%=cid%>.setHost( <%= ElementParameterParser.getValue(node, "__REGION_ENDPOINT_BQ__")%> );
<% } %>
com.google.cloud.bigquery.BigQuery bigquery_<%=cid%> = bigQueryOptionsBuilder_<%=cid%>.build().getService();
com.google.cloud.bigquery.BigQuery bigquery_<%=cid%> = new BigQueryBuilder_<%=cid%>().newBigQuery();
/* ----END-CREATING-CLIENT (Cloud API)---- */
@@ -244,7 +253,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
/* ----END-CREATING-CLIENT (OAuth based Token)---- */
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
boolean bulkFileAlreadyExists = ElementParameterParser.getBooleanValue(node, "__BULK_FILE_ALREADY_EXIST__");
String accessKey = ElementParameterParser.getValue(node, "__GS_ACCESS_KEY__");
@@ -662,7 +671,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
}
/* ----END-CREATING-JOB (OAuth 2.0)---- */
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
/* ----START-CREATING-JOB (Cloud API)---- */
com.google.cloud.bigquery.TableId tableId_<%=cid%> = com.google.cloud.bigquery.TableId.of(<%=projectId%>, <%=dataset%>, <%=table%>);
@@ -869,6 +878,6 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
/* ----END-CREATING-JOB (Cloud API)---- */
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
%>

View File

@@ -45,7 +45,8 @@
<PARAMETER NAME="AUTH_MODE" FIELD="CLOSED_LIST" NUM_ROW="3" REQUIRED="true" GROUP="AUTHENTICATION" REPOSITORY_VALUE="AUTH_MODE">
<ITEMS DEFAULT="SERVICEACCOUNT">
<ITEM NAME="SERVICEACCOUNT" VALUE="SERVICEACCOUNT" />
<ITEM NAME="OAUTH" VALUE="OAUTH" />
<ITEM NAME="APPLICATION_DEFAULT_CREDENTIALS" VALUE="APPLICATION_DEFAULT_CREDENTIALS"/>
<ITEM NAME="OAUTH" VALUE="OAUTH" />
<ITEM NAME="TOKEN" VALUE="TOKEN" />
</ITEMS>
</PARAMETER>
@@ -175,6 +176,7 @@
>
<ITEMS DEFAULT="GS_SERVICE_ACCOUNT">
<ITEM NAME="GS_SERVICE_ACCOUNT" VALUE="GS_SERVICE_ACCOUNT"/>
<ITEM NAME="GS_APPLICATION_DEFAULT_CREDENTIALS" VALUE="GS_APPLICATION_DEFAULT_CREDENTIALS"/>
<ITEM NAME="TOKEN" VALUE="TOKEN" />
</ITEMS>
</PARAMETER>
@@ -247,7 +249,7 @@
EQUIRED="true"
GROUP="REGION_ENDPOINT_GROUP"
REPOSITORY_VALUE="USE_REGION_ENDPOINT"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT')" >
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" >
<DEFAULT>false</DEFAULT>
</PARAMETER>
<PARAMETER NAME="REGION_ENDPOINT_GS"
@@ -255,7 +257,7 @@
NUM_ROW="5"
REQUIRED="false"
GROUP="REGION_ENDPOINT_GROUP"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') AND (USE_REGION_ENDPOINT == 'true')" >
SHOW_IF="((AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')) AND (USE_REGION_ENDPOINT == 'true')" >
<DEFAULT>"https://storage.googleapis.com"</DEFAULT>
</PARAMETER>
<PARAMETER NAME="REGION_ENDPOINT_BQ"
@@ -263,7 +265,7 @@
NUM_ROW="6"
REQUIRED="false"
GROUP="REGION_ENDPOINT_GROUP" REPOSITORY_VALUE="REGION_ENDPOINT_BQ"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') AND (USE_REGION_ENDPOINT == 'true')" >
SHOW_IF="((AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')) AND (USE_REGION_ENDPOINT == 'true')" >
<DEFAULT>"https://bigquery.googleapis.com"</DEFAULT>
</PARAMETER>
<PARAMETER NAME="TOKEN_NAME" FIELD="FILE" NUM_ROW="8"
@@ -308,36 +310,36 @@
<IMPORT NAME="httpclient-4.5.13" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED="true" />
<IMPORT NAME="httpcore-4.4.13" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED="true" />
<IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" 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') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<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') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<!-- TODO remove it -->
<IMPORT NAME="google-http-client-jackson-1.25.0.jar" MODULE="google-http-client-jackson-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson/1.25.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-http-client-jackson-1.25.0.jar" MODULE="google-http-client-jackson-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson/1.25.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-auth-library-credentials-0.20.0.jar" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="gax-httpjson-0.44.0.jar" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="jackson-core-asl-1.9.13.jar" MODULE="jackson-core-asl-1.9.13.jar" MVN="mvn:org.codehaus.jackson/jackson-core-asl/1.9.13" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-auth-library-oauth2-http-0.20.0.jar" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-http-client-appengine-1.38.0.jar" MODULE="google-http-client-appengine-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.38.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="api-common-1.6.0.jar" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-auth-library-credentials-0.20.0.jar" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="gax-httpjson-0.44.0.jar" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="jackson-core-asl-1.9.13.jar" MODULE="jackson-core-asl-1.9.13.jar" MVN="mvn:org.codehaus.jackson/jackson-core-asl/1.9.13" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-auth-library-oauth2-http-0.20.0.jar" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_MODE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="google-http-client-appengine-1.38.0.jar" MODULE="google-http-client-appengine-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.38.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="api-common-1.6.0.jar" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<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')" />
<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 == 'GS_APPLICATION_DEFAULT_CREDENTIALS') 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="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 == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<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.6" MODULE="protobuf-java-3.19.6.jar" MVN="mvn:com.google.protobuf/protobuf-java/3.19.6" 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')" />
<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 == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="protobuf-java-3.19.6" MODULE="protobuf-java-3.19.6.jar" MVN="mvn:com.google.protobuf/protobuf-java/3.19.6" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') 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 == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<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="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="protobuf-java-util-3.19.6" MODULE="protobuf-java-util-3.19.6.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.19.6" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="annotation-1.1.0" MODULE="annotation-1.1.0.jar" MVN="mvn:androidx.annotation/annotation/1.1.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="protobuf-java-util-3.19.6" MODULE="protobuf-java-util-3.19.6.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.19.6" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
<IMPORT NAME="annotation-1.1.0" MODULE="annotation-1.1.0.jar" MVN="mvn:androidx.annotation/annotation/1.1.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'GS_APPLICATION_DEFAULT_CREDENTIALS') OR (AUTH_TYPE == 'TOKEN')" />
</IMPORTS>
</CODEGENERATION>
<RETURNS>

View File

@@ -4,6 +4,7 @@ AUTHENTICATION.NAME=Authentication
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=Service account credentials file
AUTH_MODE.NAME=Authentication mode
AUTH_MODE.ITEM.SERVICEACCOUNT=Service account
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=Application Default Credentials
AUTH_MODE.ITEM.OAUTH=OAuth 2.0
AUTH_MODE.ITEM.TOKEN=OAuth Access Token
CLIENT_ID.NAME=Client Id
@@ -38,6 +39,7 @@ DIE_ON_ERROR.NAME=Die on error
AUTH_TYPE.NAME=Credential type
AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Service account
GS_SERVICE_ACCOUNT_KEY.NAME=Service account key
AUTH_TYPE.ITEM.GS_APPLICATION_DEFAULT_CREDENTIALS=Application Default Credentials
GS_ACCESS_TOKEN.NAME=OAuth Access Token
AUTH_TYPE.ITEM.TOKEN=OAuth Access Token
JOBID.NAME=BigQuery JobId

View File

@@ -4,6 +4,7 @@ AUTHENTICATION.NAME=Authentification
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=Fichier d'identifiants du compte de service
AUTH_MODE.NAME=Mode d'authentification
AUTH_MODE.ITEM.SERVICEACCOUNT=Compte de service
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=Identifiants par d\u00E9faut pour l'application
AUTH_MODE.ITEM.OAUTH=OAuth 2.0
AUTH_MODE.ITEM.TOKEN=Jeton d'acc\u00E8s OAuth
CLIENT_ID.NAME=ID client
@@ -38,6 +39,7 @@ DIE_ON_ERROR.NAME=Arr\u00EAter en cas d'erreur
AUTH_TYPE.NAME=Type d'identifiant
AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Compte de service
GS_SERVICE_ACCOUNT_KEY.NAME=Cl\u00E9 du compte de service
AUTH_TYPE.ITEM.GS_APPLICATION_DEFAULT_CREDENTIALS=Identifiants par d\u00E9faut pour l'application
GS_ACCESS_TOKEN.NAME=Jeton d'acc\u00E8s OAuth
AUTH_TYPE.ITEM.TOKEN=Jeton d'acc\u00E8s OAuth
JOBID.NAME=ID du Job BigQuery

View File

@@ -4,6 +4,7 @@ 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
AUTH_MODE.NAME=\u8A8D\u8A3C\u30E2\u30FC\u30C9
AUTH_MODE.ITEM.SERVICEACCOUNT=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u8A8D\u8A3C\u60C5\u5831
AUTH_MODE.ITEM.OAUTH=OAuth2.0
AUTH_MODE.ITEM.TOKEN=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
CLIENT_ID.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8ID
@@ -38,6 +39,7 @@ DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u
AUTH_TYPE.NAME=\u8A8D\u8A3C\u60C5\u5831\u306E\u30BF\u30A4\u30D7
AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8
GS_SERVICE_ACCOUNT_KEY.NAME=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8\u30AD\u30FC
AUTH_TYPE.ITEM.GS_APPLICATION_DEFAULT_CREDENTIALS=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u8A8D\u8A3C\u60C5\u5831
GS_ACCESS_TOKEN.NAME=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
AUTH_TYPE.ITEM.TOKEN=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
JOBID.NAME=BigQuery JobId

View File

@@ -4,6 +4,7 @@ AUTHENTICATION.NAME=\u8EAB\u4EFD\u9A8C\u8BC1
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=\u670D\u52A1\u5E10\u6237\u7528\u6237\u540D\u548C\u5BC6\u7801\u6587\u4EF6
AUTH_MODE.NAME=\u8EAB\u4EFD\u9A8C\u8BC1\u6A21\u5F0F
AUTH_MODE.ITEM.SERVICEACCOUNT=\u670D\u52A1\u5E10\u6237
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=\u5E94\u7528\u7A0B\u5E8F\u9ED8\u8BA4\u51ED\u636E
AUTH_MODE.ITEM.OAUTH=OAuth 2.0
AUTH_MODE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
CLIENT_ID.NAME=\u5BA2\u6237\u7AEF ID
@@ -38,6 +39,7 @@ DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
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
AUTH_TYPE.ITEM.GS_APPLICATION_DEFAULT_CREDENTIALS=\u5E94\u7528\u7A0B\u5E8F\u9ED8\u8BA4\u51ED\u636E
GS_ACCESS_TOKEN.NAME=OAuth \u8BBF\u95EE\u4EE4\u724C
AUTH_TYPE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
JOBID.NAME=BigQuery JobId

View File

@@ -14,10 +14,14 @@ class ServiceAccountBigQueryUtil_<%=cid%> {
return bigQuery;
}
com.google.auth.oauth2.GoogleCredentials credentials;
java.io.File credentialsFile = new java.io.File(<%=credentialsFile%>);
try(java.io.FileInputStream credentialsStream = new java.io.FileInputStream(credentialsFile)) {
credentials = com.google.auth.oauth2.ServiceAccountCredentials.fromStream(credentialsStream);
}
<% if(authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) { %>
credentials = com.google.auth.oauth2.GoogleCredentials.getApplicationDefault();
<% } else { %>
java.io.File credentialsFile = new java.io.File(<%=credentialsFile%>);
try(java.io.FileInputStream credentialsStream = new java.io.FileInputStream(credentialsFile)) {
credentials = com.google.auth.oauth2.ServiceAccountCredentials.fromStream(credentialsStream);
}
<% } %>
com.google.cloud.bigquery.BigQueryOptions.Builder bigQueryOptionsBuilder = com.google.cloud.bigquery.BigQueryOptions.newBuilder()
.setCredentials(credentials)

View File

@@ -295,7 +295,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
%>
//Dynamic end
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
<%@ include file="@{org.talend.designer.components.localprovider}/components/tBigQueryInput/ServiceAccountBigQueryHelper.javajet"%>
@@ -390,7 +390,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
//Dynamic end
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
if (authMode.equals("OAUTH") || authMode.equals("TOKEN")) {
@@ -441,14 +441,14 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
Object value_<%=cid%> = null;
nb_line_<%=cid%> ++;
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
for (com.google.cloud.bigquery.FieldValueList field_<%=cid %> : result_<%=cid%>.iterateAll()) {
Object value_<%=cid%>;
nb_line_<%=cid%> ++;
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
%>
int fieldsCount_<%=cid %> = field_<%=cid %>.size();
@@ -500,12 +500,12 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
%>
value_<%=cid%> = field_<%=cid %>.get(column_index_<%=cid%>).getV();
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
value_<%=cid%> = field_<%=cid %>.get(column_index_<%=cid%>).getValue();
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
%>
if(com.google.api.client.util.Data.isNull(value_<%=cid%>)) value_<%=cid%> = null;

View File

@@ -26,7 +26,7 @@ imports="
}
}
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
}
if (child_statistics_<%=cid%> != null) {
@@ -35,7 +35,7 @@ imports="
//}
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\" or \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\" or \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
log4jFileUtil.retrievedDataNumberInfo(node);
// Else job has finished successfully with the results. Finish }.

View File

@@ -62,7 +62,8 @@
<PARAMETER NAME="AUTH_MODE" FIELD="CLOSED_LIST" NUM_ROW="3" REQUIRED="true" GROUP="AUTHENTICATION" REPOSITORY_VALUE="AUTH_MODE">
<ITEMS DEFAULT="SERVICEACCOUNT">
<ITEM NAME="SERVICEACCOUNT" VALUE="SERVICEACCOUNT" />
<ITEM NAME="OAUTH" VALUE="OAUTH" />
<ITEM NAME="APPLICATION_DEFAULT_CREDENTIALS" VALUE="APPLICATION_DEFAULT_CREDENTIALS"/>
<ITEM NAME="OAUTH" VALUE="OAUTH" />
<ITEM NAME="TOKEN" VALUE="TOKEN" />
</ITEMS>
</PARAMETER>
@@ -188,7 +189,7 @@
EQUIRED="true"
GROUP="REGION_ENDPOINT_GROUP"
REPOSITORY_VALUE="USE_REGION_ENDPOINT"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT')" >
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" >
<DEFAULT>false</DEFAULT>
</PARAMETER>
<PARAMETER NAME="REGION_ENDPOINT_BQ"
@@ -196,7 +197,7 @@
NUM_ROW="6"
REQUIRED="false"
GROUP="REGION_ENDPOINT_GROUP" REPOSITORY_VALUE="REGION_ENDPOINT_BQ"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') AND (USE_REGION_ENDPOINT == 'true')" >
SHOW_IF="((AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')) AND (USE_REGION_ENDPOINT == 'true')" >
<DEFAULT>"https://bigquery.googleapis.com"</DEFAULT>
</PARAMETER>
<PARAMETER NAME="TOKEN_NAME" FIELD="FILE" NUM_ROW="8"
@@ -249,25 +250,25 @@
<IMPORT NAME="guava-32.1.2-jre.jar" MODULE="guava-32.1.2-jre.jar" MVN="mvn:com.google.guava/guava/32.1.2-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.14.3.jar" MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3" 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'" />
<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') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<!-- TODO remove it -->
<IMPORT NAME="google-http-client-jackson-1.25.0.jar" MODULE="google-http-client-jackson-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson/1.25.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="google-http-client-jackson-1.25.0.jar" MODULE="google-http-client-jackson-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson/1.25.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="google-auth-library-credentials-0.20.0.jar" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="gax-httpjson-0.44.0.jar" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="jackson-core-asl-1.9.13.jar" MODULE="jackson-core-asl-1.9.13.jar" MVN="mvn:org.codehaus.jackson/jackson-core-asl/1.9.13" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="google-auth-library-oauth2-http-0.20.0.jar" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="google-http-client-appengine-1.38.0.jar" MODULE="google-http-client-appengine-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.38.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="api-common-1.6.0.jar" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="google-auth-library-credentials-0.20.0.jar" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="gax-httpjson-0.44.0.jar" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="jackson-core-asl-1.9.13.jar" MODULE="jackson-core-asl-1.9.13.jar" MVN="mvn:org.codehaus.jackson/jackson-core-asl/1.9.13" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="google-auth-library-oauth2-http-0.20.0.jar" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="google-http-client-appengine-1.38.0.jar" MODULE="google-http-client-appengine-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.38.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<IMPORT NAME="api-common-1.6.0.jar" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
<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.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" 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') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
</IMPORTS>
</CODEGENERATION>
<RETURNS>

View File

@@ -4,6 +4,7 @@ AUTHENTICATION.NAME=Authentication
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=Service account credentials file
AUTH_MODE.NAME=Authentication mode
AUTH_MODE.ITEM.SERVICEACCOUNT=Service account
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=Application Default Credentials
AUTH_MODE.ITEM.OAUTH=OAuth 2.0
AUTH_MODE.ITEM.TOKEN=OAuth Access Token
CLIENT_ID.NAME=Client Id

View File

@@ -4,6 +4,7 @@ AUTHENTICATION.NAME=Authentification
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=Fichier d'identifiants du compte de service
AUTH_MODE.NAME=Mode d'authentification
AUTH_MODE.ITEM.SERVICEACCOUNT=Compte de service
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=Identifiants par d\u00E9faut pour l'application
AUTH_MODE.ITEM.OAUTH=OAuth 2.0
AUTH_MODE.ITEM.TOKEN=Jeton d'acc\u00E8s OAuth
CLIENT_ID.NAME=ID client

View File

@@ -4,6 +4,7 @@ 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
AUTH_MODE.NAME=\u8A8D\u8A3C\u30E2\u30FC\u30C9
AUTH_MODE.ITEM.SERVICEACCOUNT=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u8A8D\u8A3C\u60C5\u5831
AUTH_MODE.ITEM.OAUTH=OAuth2.0
AUTH_MODE.ITEM.TOKEN=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
CLIENT_ID.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8ID

View File

@@ -4,6 +4,7 @@ AUTHENTICATION.NAME=\u8EAB\u4EFD\u9A8C\u8BC1
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=\u670D\u52A1\u5E10\u6237\u7528\u6237\u540D\u548C\u5BC6\u7801\u6587\u4EF6
AUTH_MODE.NAME=\u8EAB\u4EFD\u9A8C\u8BC1\u6A21\u5F0F
AUTH_MODE.ITEM.SERVICEACCOUNT=\u670D\u52A1\u5E10\u6237
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=\u5E94\u7528\u7A0B\u5E8F\u9ED8\u8BA4\u51ED\u636E
AUTH_MODE.ITEM.OAUTH=OAuth 2.0
AUTH_MODE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
CLIENT_ID.NAME=\u5BA2\u6237\u7AEF ID

View File

@@ -58,7 +58,8 @@
<PARAMETER NAME="AUTH_MODE" FIELD="CLOSED_LIST" NUM_ROW="15" REQUIRED="true" GROUP="AUTHENTICATION" REPOSITORY_VALUE="AUTH_MODE">
<ITEMS DEFAULT="SERVICEACCOUNT">
<ITEM NAME="SERVICEACCOUNT" VALUE="SERVICEACCOUNT" />
<ITEM NAME="OAUTH" VALUE="OAUTH" />
<ITEM NAME="APPLICATION_DEFAULT_CREDENTIALS" VALUE="APPLICATION_DEFAULT_CREDENTIALS"/>
<ITEM NAME="OAUTH" VALUE="OAUTH" />
<ITEM NAME="TOKEN" VALUE="TOKEN" />
</ITEMS>
</PARAMETER>
@@ -186,6 +187,7 @@
SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false')">
<ITEMS DEFAULT="GS_SERVICE_ACCOUNT">
<ITEM NAME="GS_SERVICE_ACCOUNT" VALUE="GS_SERVICE_ACCOUNT"/>
<ITEM NAME="GS_APPLICATION_DEFAULT_CREDENTIALS" VALUE="GS_APPLICATION_DEFAULT_CREDENTIALS"/>
<ITEM NAME="TOKEN" VALUE="TOKEN" />
</ITEMS>
</PARAMETER>
@@ -253,10 +255,10 @@
NAME="USE_REGION_ENDPOINT"
FIELD="CHECK"
NUM_ROW="4"
EQUIRED="true"
EQUIRED="true"
GROUP="REGION_ENDPOINT_GROUP"
REPOSITORY_VALUE="USE_REGION_ENDPOINT"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT')" >
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" >
<DEFAULT>false</DEFAULT>
</PARAMETER>
<PARAMETER
@@ -265,7 +267,7 @@
NUM_ROW="5"
REQUIRED="false"
GROUP="REGION_ENDPOINT_GROUP"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') AND (USE_REGION_ENDPOINT == 'true')" >
SHOW_IF="((AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')) AND (USE_REGION_ENDPOINT == 'true')" >
<DEFAULT>"https://storage.googleapis.com"</DEFAULT>
</PARAMETER>
<PARAMETER
@@ -275,7 +277,7 @@
REQUIRED="false"
GROUP="REGION_ENDPOINT_GROUP"
REPOSITORY_VALUE="REGION_ENDPOINT_BQ"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') AND (USE_REGION_ENDPOINT == 'true')" >
SHOW_IF="((AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')) AND (USE_REGION_ENDPOINT == 'true')" >
<DEFAULT>"https://bigquery.googleapis.com"</DEFAULT>
</PARAMETER>
<PARAMETER NAME="TOKEN_NAME" FIELD="FILE" NUM_ROW="8"
@@ -301,7 +303,7 @@
<DEFAULT>","</DEFAULT>
</PARAMETER>
<PARAMETER NAME="DROP" FIELD="CHECK" REQUIRED="true" NUM_ROW="33" SHOW_IF="AUTH_MODE == 'SERVICEACCOUNT'">
<PARAMETER NAME="DROP" FIELD="CHECK" REQUIRED="true" NUM_ROW="33" SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')">
<DEFAULT>false</DEFAULT>
</PARAMETER>

View File

@@ -19,6 +19,7 @@ AUTHENTICATION.NAME=Authentication
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=Service account credentials file
AUTH_MODE.NAME=Authentication mode
AUTH_MODE.ITEM.SERVICEACCOUNT=Service account
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=Application Default Credentials
AUTH_MODE.ITEM.OAUTH=OAuth 2.0
AUTH_MODE.ITEM.TOKEN=OAuth Access Token
CLIENT_ID.NAME=Client Id
@@ -49,6 +50,7 @@ CHECK_DISK_SPACE.NAME=Check disk space
DIE_ON_ERROR.NAME=Die on error
AUTH_TYPE.NAME=Credential type
AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Service account
AUTH_TYPE.ITEM.GS_APPLICATION_DEFAULT_CREDENTIALS=Application Default Credentials
AUTH_TYPE.ITEM.TOKEN=OAuth Access Token
GS_SERVICE_ACCOUNT_KEY.NAME=Service account key
GS_ACCESS_TOKEN.NAME=OAuth Access Token

View File

@@ -19,6 +19,7 @@ AUTHENTICATION.NAME=Authentification
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=Fichier d'identifiants du compte de service
AUTH_MODE.NAME=Mode d'authentification
AUTH_MODE.ITEM.SERVICEACCOUNT=Compte de service
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=Identifiants par d\u00E9faut pour l'application
AUTH_MODE.ITEM.OAUTH=OAuth 2.0
AUTH_MODE.ITEM.TOKEN=Jeton d'acc\u00E8s OAuth
CLIENT_ID.NAME=ID client
@@ -49,6 +50,7 @@ CHECK_DISK_SPACE.NAME=V\u00E9rifier l'espace disque
DIE_ON_ERROR.NAME=Arr\u00EAter en cas d'erreur
AUTH_TYPE.NAME=Type d'identifiant
AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Compte de service
AUTH_TYPE.ITEM.GS_APPLICATION_DEFAULT_CREDENTIALS=Identifiants par d\u00E9faut pour l'application
AUTH_TYPE.ITEM.TOKEN=Jeton d'acc\u00E8s OAuth
GS_SERVICE_ACCOUNT_KEY.NAME=Cl\u00E9 du compte de service
GS_ACCESS_TOKEN.NAME=Jeton d'acc\u00E8s OAuth

View File

@@ -19,6 +19,7 @@ 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
AUTH_MODE.NAME=\u8A8D\u8A3C\u30E2\u30FC\u30C9
AUTH_MODE.ITEM.SERVICEACCOUNT=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u8A8D\u8A3C\u60C5\u5831
AUTH_MODE.ITEM.OAUTH=OAuth2.0
AUTH_MODE.ITEM.TOKEN=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
CLIENT_ID.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8ID
@@ -49,6 +50,7 @@ CHECK_DISK_SPACE.NAME=\u30C7\u30A3\u30B9\u30AF\u5BB9\u91CF\u306E\u78BA\u8A8D
DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u4E86
AUTH_TYPE.NAME=\u8A8D\u8A3C\u60C5\u5831\u306E\u30BF\u30A4\u30D7
AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8
AUTH_TYPE.ITEM.GS_APPLICATION_DEFAULT_CREDENTIALS=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u8A8D\u8A3C\u60C5\u5831
AUTH_TYPE.ITEM.TOKEN=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
GS_SERVICE_ACCOUNT_KEY.NAME=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8\u30AD\u30FC
GS_ACCESS_TOKEN.NAME=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3

View File

@@ -19,6 +19,7 @@ AUTHENTICATION.NAME=\u8EAB\u4EFD\u9A8C\u8BC1
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=\u670D\u52A1\u5E10\u6237\u7528\u6237\u540D\u548C\u5BC6\u7801\u6587\u4EF6
AUTH_MODE.NAME=\u8EAB\u4EFD\u9A8C\u8BC1\u6A21\u5F0F
AUTH_MODE.ITEM.SERVICEACCOUNT=\u670D\u52A1\u5E10\u6237
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=\u5E94\u7528\u7A0B\u5E8F\u9ED8\u8BA4\u51ED\u636E
AUTH_MODE.ITEM.OAUTH=OAuth 2.0
AUTH_MODE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
CLIENT_ID.NAME=\u5BA2\u6237\u7AEF ID
@@ -49,6 +50,7 @@ CHECK_DISK_SPACE.NAME=\u68C0\u67E5\u78C1\u76D8\u7A7A\u95F4
DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
AUTH_TYPE.NAME=\u51ED\u8BC1\u7C7B\u578B
AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
AUTH_TYPE.ITEM.GS_APPLICATION_DEFAULT_CREDENTIALS=\u5E94\u7528\u7A0B\u5E8F\u9ED8\u8BA4\u51ED\u636E
AUTH_TYPE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
GS_SERVICE_ACCOUNT_KEY.NAME=\u670D\u52A1\u5E10\u6237\u5BC6\u94A5
GS_ACCESS_TOKEN.NAME=OAuth \u8BBF\u95EE\u4EE4\u724C

View File

@@ -179,13 +179,17 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee.getMessage());
BigQueryUtil_<%=cid%> bigQueryUtil_<%=cid%> = new BigQueryUtil_<%=cid%>(PROJECT_ID_<%=cid%>, bigqueryclient_<%=cid%>, <% if (authMode.equals("OAUTH")) { %> tokenFile_<%=cid%> <% } else { %> null <%}%>);
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
com.google.auth.oauth2.GoogleCredentials credentials_<%=cid%>;
<% if(authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) { %>
credentials_<%=cid%> = com.google.auth.oauth2.GoogleCredentials.getApplicationDefault();
<% } else { %>
java.io.File credentialsFile_<%=cid%> = new java.io.File(<%=credentialsFile%>);
try(java.io.FileInputStream credentialsStream_<%=cid%> = new java.io.FileInputStream(credentialsFile_<%=cid%>)) {
credentials_<%=cid%> = com.google.auth.oauth2.ServiceAccountCredentials.fromStream(credentialsStream_<%=cid%>);
}
<% } %>
com.google.cloud.bigquery.BigQueryOptions.Builder bigQueryOptionsBuilder_<%=cid%> = com.google.cloud.bigquery.BigQueryOptions.newBuilder().setCredentials(credentials_<%=cid%>).setProjectId(<%=projectId%>);
<% if( "true".equals(ElementParameterParser.getValue(node, "__USE_REGION_ENDPOINT__")) ){ %>
@@ -195,6 +199,6 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee.getMessage());
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\" or \"OAUTH\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\" or \"OAUTH\", but it is " + authMode);
}
%>

View File

@@ -50,6 +50,7 @@
REPOSITORY_VALUE="AUTH_MODE">
<ITEMS DEFAULT="SERVICEACCOUNT">
<ITEM NAME="SERVICEACCOUNT" VALUE="SERVICEACCOUNT"/>
<ITEM NAME="APPLICATION_DEFAULT_CREDENTIALS" VALUE="APPLICATION_DEFAULT_CREDENTIALS"/>
<ITEM NAME="OAUTH" VALUE="OAUTH"/>
<ITEM NAME="TOKEN" VALUE="TOKEN" />
</ITEMS>
@@ -156,7 +157,7 @@
NUM_ROW="4"
EQUIRED="true"
GROUP="REGION_ENDPOINT_GROUP" REPOSITORY_VALUE="USE_REGION_ENDPOINT"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT')" >
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" >
<DEFAULT>false</DEFAULT>
</PARAMETER>
<PARAMETER NAME="REGION_ENDPOINT_BQ"
@@ -164,7 +165,7 @@
NUM_ROW="6"
REQUIRED="false"
GROUP="REGION_ENDPOINT_GROUP" REPOSITORY_VALUE="REGION_ENDPOINT_BQ"
SHOW_IF="(AUTH_MODE == 'SERVICEACCOUNT') AND (USE_REGION_ENDPOINT == 'true')" >
SHOW_IF="((AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')) AND (USE_REGION_ENDPOINT == 'true')" >
<DEFAULT>"https://bigquery.googleapis.com"</DEFAULT>
</PARAMETER>
@@ -226,25 +227,25 @@
<IMPORT NAME="guava-32.1.2-jre.jar" MODULE="guava-32.1.2-jre.jar" MVN="mvn:com.google.guava/guava/32.1.2-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.14.3.jar" MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3" 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'"/>
<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') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<!-- TODO remove it -->
<IMPORT NAME="google-http-client-jackson-1.25.0.jar" MODULE="google-http-client-jackson-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson/1.25.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="google-http-client-jackson-1.25.0.jar" MODULE="google-http-client-jackson-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson/1.25.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="google-auth-library-credentials-0.20.0.jar" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="gax-httpjson-0.44.0.jar" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="jackson-core-asl-1.9.13.jar" MODULE="jackson-core-asl-1.9.13.jar" MVN="mvn:org.codehaus.jackson/jackson-core-asl/1.9.13" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="google-auth-library-oauth2-http-0.20.0.jar" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="google-http-client-appengine-1.38.0.jar" MODULE="google-http-client-appengine-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.38.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="api-common-1.6.0.jar" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="google-auth-library-credentials-0.20.0.jar" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="gax-httpjson-0.44.0.jar" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="jackson-core-asl-1.9.13.jar" MODULE="jackson-core-asl-1.9.13.jar" MVN="mvn:org.codehaus.jackson/jackson-core-asl/1.9.13" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="google-auth-library-oauth2-http-0.20.0.jar" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="google-http-client-appengine-1.38.0.jar" MODULE="google-http-client-appengine-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.38.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<IMPORT NAME="api-common-1.6.0.jar" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')"/>
<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.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" 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') OR (AUTH_MODE == 'APPLICATION_DEFAULT_CREDENTIALS')" />
</IMPORTS>
</CODEGENERATION>
<RETURNS>

View File

@@ -78,7 +78,7 @@
insert_jobs_<%=cid%> = java.util.Collections.singletonList(insert_<%=cid%>);
}
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
com.google.cloud.bigquery.QueryJobConfiguration queryConfiguration_<%=cid%> = com.google.cloud.bigquery.QueryJobConfiguration.newBuilder(<%=query%>).setUseLegacySql(<%=useLegacySql%>).build();
com.google.cloud.bigquery.JobId jobId_<%=cid%> = com.google.cloud.bigquery.JobId.of(java.util.UUID.randomUUID().toString());
@@ -143,7 +143,7 @@
%>
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
List< ? extends IConnection> conns = node.getOutgoingSortedConnections();
@@ -184,7 +184,7 @@
Object value_<%=cid%> = null;
nb_line_<%=cid%> ++;
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
long nb_line_<%=cid%> = 0;
for (com.google.cloud.bigquery.Job job_iterable_<%=cid%> : childJobs_<%=cid%>) {
@@ -202,7 +202,7 @@
nb_line_<%=cid%> ++;
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
List<IMetadataTable> metadatas = node.getMetadataList();
@@ -228,12 +228,12 @@
%>
value_<%=cid%> = field_<%=cid %>.get(<%=i%>).getV();
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
value_<%=cid%> = field_<%=cid %>.get(<%=i%>).getValue();
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\", \"OAUTH\" or \"TOKEN\", but it is " + authMode);
}
%>
if(com.google.api.client.util.Data.isNull(value_<%=cid%>)) value_<%=cid%> = null;

View File

@@ -4,6 +4,7 @@ AUTHENTICATION.NAME=Authentication
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=Service account credentials file
AUTH_MODE.NAME=Authentication mode
AUTH_MODE.ITEM.SERVICEACCOUNT=Service account
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=Application Default Credentials
AUTH_MODE.ITEM.OAUTH=OAuth 2.0
AUTH_MODE.ITEM.TOKEN=OAuth Access Token
CLIENT_ID.NAME=Client Id

View File

@@ -4,6 +4,7 @@ AUTHENTICATION.NAME=Authentification
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=Fichier d'identifiants du compte de service
AUTH_MODE.NAME=Mode d'authentification
AUTH_MODE.ITEM.SERVICEACCOUNT=Compte de service
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=Identifiants par d\u00E9faut pour l'application
AUTH_MODE.ITEM.OAUTH=OAuth 2.0
AUTH_MODE.ITEM.TOKEN=Jeton d'acc\u00E8s OAuth
CLIENT_ID.NAME=ID client

View File

@@ -4,6 +4,7 @@ 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
AUTH_MODE.NAME=\u8A8D\u8A3C\u30E2\u30FC\u30C9
AUTH_MODE.ITEM.SERVICEACCOUNT=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u8A8D\u8A3C\u60C5\u5831
AUTH_MODE.ITEM.OAUTH=OAuth2.0
AUTH_MODE.ITEM.TOKEN=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
CLIENT_ID.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8ID

View File

@@ -4,6 +4,7 @@ AUTHENTICATION.NAME=\u8EAB\u4EFD\u9A8C\u8BC1
SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=\u670D\u52A1\u5E10\u6237\u7528\u6237\u540D\u548C\u5BC6\u7801\u6587\u4EF6
AUTH_MODE.NAME=\u8EAB\u4EFD\u9A8C\u8BC1\u6A21\u5F0F
AUTH_MODE.ITEM.SERVICEACCOUNT=\u670D\u52A1\u5E10\u6237
AUTH_MODE.ITEM.APPLICATION_DEFAULT_CREDENTIALS=\u5E94\u7528\u7A0B\u5E8F\u9ED8\u8BA4\u51ED\u636E
AUTH_MODE.ITEM.OAUTH=OAuth 2.0
AUTH_MODE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
CLIENT_ID.NAME=\u5BA2\u6237\u7AEF ID

View File

@@ -31,20 +31,20 @@ imports="
}
}
<%
} else if (authMode.equals("SERVICEACCOUNT")) {
} else if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
}
}
<%
} else {
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\" or \"OAUTH\"or \"TOKEN\", but it is " + authMode);
throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\", \"APPLICATION_DEFAULT_CREDENTIALS\" or \"OAUTH\"or \"TOKEN\", but it is " + authMode);
}
log4jFileUtil.retrievedDataNumberInfo(node);
}
}
}
if (authMode.equals("SERVICEACCOUNT")) {
if (authMode.equals("SERVICEACCOUNT") || authMode.equals("APPLICATION_DEFAULT_CREDENTIALS")) {
%>
if (job_<%=cid%>.getStatistics().getNumChildJobs() != null) {
globalMap.put("<%=cid%>_STATISTICS_CHILD", childJobs_<%=cid%>.stream()

View File

@@ -119,8 +119,8 @@
<!-- Bonita 6.5.2 HTTP API -->
<IMPORT NAME="talend-bonita-client-1.0.1.jar" MODULE="talend-bonita-client-1.0.1.jar" MVN="mvn:org.talend.bonita/talend-bonita-client/1.0.1" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="bonita-client-6.5.2.jar" MODULE="bonita-client-6.5.2.jar" MVN="mvn:org.talend.libraries/bonita-client-6.5.2/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="bonita-common-6.5.2.jar" MODULE="bonita-common-6.5.2.jar" MVN="mvn:org.talend.libraries/bonita-common-6.5.2/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="bonita-client-6.5.2.jar" MODULE="bonita-client-6.5.2.jar" MVN="mvn:org.bonitasoft.engine/bonita-client/6.5.2" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="bonita-common-6.5.2.jar" MODULE="bonita-common-6.5.2.jar" MVN="mvn:org.bonitasoft.engine/bonita-common/6.5.2" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.apache.httpcomponents/httpmime/4.2.5" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="httpclient-4.5.13.jar" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
@@ -130,10 +130,10 @@
<!-- Bonita 6.5.2 JAVA API -->
<IMPORT NAME="talend-bonita-client-1.0.1.jar" MODULE="talend-bonita-client-1.0.1.jar" MVN="mvn:org.talend.bonita/talend-bonita-client/1.0.1" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-client-6.5.2.jar" MODULE="bonita-client-6.5.2.jar" MVN="mvn:org.talend.libraries/bonita-client-6.5.2/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-common-6.5.2.jar" MODULE="bonita-common-6.5.2.jar" MVN="mvn:org.talend.libraries/bonita-common-6.5.2/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-server-6.5.2.jar" MODULE="bonita-server-6.5.2.jar" MVN="mvn:org.talend.libraries/bonita-server-6.5.2/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="xpp3-1.1.6.jar" MODULE="xpp3-1.1.6.jar" MVN="mvn:org.talend.libraries/xpp3-1.1.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xpp3-1.1.6.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-client-6.5.2.jar" MODULE="bonita-client-6.5.2.jar" MVN="mvn:org.bonitasoft.engine/bonita-client/6.5.2" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-common-6.5.2.jar" MODULE="bonita-common-6.5.2.jar" MVN="mvn:org.bonitasoft.engine/bonita-common/6.5.2" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-server-6.5.2.jar" MODULE="bonita-server-6.5.2.jar" MVN="mvn:org.bonitasoft.engine/bonita-server/6.5.2" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="xpp3-1.1.6.jar" MODULE="xpp3-1.1.6.jar" MVN="mvn:org.ogce/xpp3/1.1.6" UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xpp3-1.1.6.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.apache.httpcomponents/httpmime/4.2.5" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="httpclient-4.5.13.jar" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
@@ -144,7 +144,7 @@
<!-- Bonita 7.2.4 HTTP API -->
<IMPORT NAME="talend-bonita-client-1.0.1.jar" MODULE="talend-bonita-client-1.0.1.jar" MVN="mvn:org.talend.bonita/talend-bonita-client/1.0.1" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="bonita-client-7.2.4.jar" MODULE="bonita-client-7.2.4.jar" MVN="mvn:org.talend.libraries/bonita-client-7.2.4/6.3.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="bonita-common-7.2.4.jar" MODULE="bonita-common-7.2.4.jar" MVN="mvn:org.talend.libraries/bonita-common-7.2.4/6.3.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="bonita-common-7.2.4.jar" MODULE="bonita-common-7.2.4.jar" MVN="mvn:org.bonitasoft.engine/bonita-common/7.2.4" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.apache.httpcomponents/httpmime/4.2.5" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="httpclient-4.5.13.jar" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
@@ -155,9 +155,9 @@
<!-- Bonita 7.2.4 JAVA API -->
<IMPORT NAME="talend-bonita-client-1.0.1.jar" MODULE="talend-bonita-client-1.0.1.jar" MVN="mvn:org.talend.bonita/talend-bonita-client/1.0.1" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-client-7.2.4.jar" MODULE="bonita-client-7.2.4.jar" MVN="mvn:org.talend.libraries/bonita-client-7.2.4/6.3.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-common-7.2.4.jar" MODULE="bonita-common-7.2.4.jar" MVN="mvn:org.talend.libraries/bonita-common-7.2.4/6.3.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-common-7.2.4.jar" MODULE="bonita-common-7.2.4.jar" MVN="mvn:org.bonitasoft.engine/bonita-common/7.2.4" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-server-7.2.4.jar" MODULE="bonita-server-7.2.4.jar" MVN="mvn:org.talend.libraries/bonita-server-7.2.4/6.3.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="xpp3-1.1.6.jar" MODULE="xpp3-1.1.6.jar" MVN="mvn:org.talend.libraries/xpp3-1.1.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xpp3-1.1.6.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="xpp3-1.1.6.jar" MODULE="xpp3-1.1.6.jar" MVN="mvn:org.ogce/xpp3/1.1.6" UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xpp3-1.1.6.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.apache.httpcomponents/httpmime/4.2.5" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="httpclient-4.5.13.jar" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />

View File

@@ -158,8 +158,8 @@
<!-- Bonita 6.5.2 HTTP API -->
<IMPORT NAME="talend-bonita-client-1.0.1.jar" MODULE="talend-bonita-client-1.0.1.jar" MVN="mvn:org.talend.bonita/talend-bonita-client/1.0.1" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="bonita-client-6.5.2.jar" MODULE="bonita-client-6.5.2.jar" MVN="mvn:org.talend.libraries/bonita-client-6.5.2/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="bonita-common-6.5.2.jar" MODULE="bonita-common-6.5.2.jar" MVN="mvn:org.talend.libraries/bonita-common-6.5.2/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="bonita-client-6.5.2.jar" MODULE="bonita-client-6.5.2.jar" MVN="mvn:org.bonitasoft.engine/bonita-client/6.5.2" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="bonita-common-6.5.2.jar" MODULE="bonita-common-6.5.2.jar" MVN="mvn:org.bonitasoft.engine/bonita-common/6.5.2" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.apache.httpcomponents/httpmime/4.2.5" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="httpclient-4.5.13.jar" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
@@ -170,10 +170,10 @@
<!-- Bonita 6.5.2 JAVA API -->
<IMPORT NAME="talend-bonita-client-1.0.1.jar" MODULE="talend-bonita-client-1.0.1.jar" MVN="mvn:org.talend.bonita/talend-bonita-client/1.0.1" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-client-6.5.2.jar" MODULE="bonita-client-6.5.2.jar" MVN="mvn:org.talend.libraries/bonita-client-6.5.2/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-common-6.5.2.jar" MODULE="bonita-common-6.5.2.jar" MVN="mvn:org.talend.libraries/bonita-common-6.5.2/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-server-6.5.2.jar" MODULE="bonita-server-6.5.2.jar" MVN="mvn:org.talend.libraries/bonita-server-6.5.2/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="xpp3-1.1.6.jar" MODULE="xpp3-1.1.6.jar" MVN="mvn:org.talend.libraries/xpp3-1.1.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xpp3-1.1.6.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-client-6.5.2.jar" MODULE="bonita-client-6.5.2.jar" MVN="mvn:org.bonitasoft.engine/bonita-client/6.5.2" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-common-6.5.2.jar" MODULE="bonita-common-6.5.2.jar" MVN="mvn:org.bonitasoft.engine/bonita-common/6.5.2" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-server-6.5.2.jar" MODULE="bonita-server-6.5.2.jar" MVN="mvn:org.bonitasoft.engine/bonita-server/6.5.2" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="xpp3-1.1.6.jar" MODULE="xpp3-1.1.6.jar" MVN="mvn:org.ogce/xpp3/1.1.6" UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xpp3-1.1.6.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.apache.httpcomponents/httpmime/4.2.5" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="httpclient-4.5.13.jar" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
@@ -184,7 +184,7 @@
<!-- Bonita 7.2.4 HTTP API -->
<IMPORT NAME="talend-bonita-client-1.0.1.jar" MODULE="talend-bonita-client-1.0.1.jar" MVN="mvn:org.talend.bonita/talend-bonita-client/1.0.1" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="bonita-client-7.2.4.jar" MODULE="bonita-client-7.2.4.jar" MVN="mvn:org.talend.libraries/bonita-client-7.2.4/6.3.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="bonita-common-7.2.4.jar" MODULE="bonita-common-7.2.4.jar" MVN="mvn:org.talend.libraries/bonita-common-7.2.4/6.3.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="bonita-common-7.2.4.jar" MODULE="bonita-common-7.2.4.jar" MVN="mvn:org.bonitasoft.engine/bonita-common/7.2.4" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.apache.httpcomponents/httpmime/4.2.5" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
<IMPORT NAME="httpclient-4.5.13.jar" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
@@ -196,9 +196,9 @@
<!-- Bonita 7.2.4 JAVA API -->
<IMPORT NAME="talend-bonita-client-1.0.1.jar" MODULE="talend-bonita-client-1.0.1.jar" MVN="mvn:org.talend.bonita/talend-bonita-client/1.0.1" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-client-7.2.4.jar" MODULE="bonita-client-7.2.4.jar" MVN="mvn:org.talend.libraries/bonita-client-7.2.4/6.3.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-common-7.2.4.jar" MODULE="bonita-common-7.2.4.jar" MVN="mvn:org.talend.libraries/bonita-common-7.2.4/6.3.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-common-7.2.4.jar" MODULE="bonita-common-7.2.4.jar" MVN="mvn:org.bonitasoft.engine/bonita-common/7.2.4" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="bonita-server-7.2.4.jar" MODULE="bonita-server-7.2.4.jar" MVN="mvn:org.talend.libraries/bonita-server-7.2.4/6.3.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="xpp3-1.1.6.jar" MODULE="xpp3-1.1.6.jar" MVN="mvn:org.talend.libraries/xpp3-1.1.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xpp3-1.1.6.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="xpp3-1.1.6.jar" MODULE="xpp3-1.1.6.jar" MVN="mvn:org.ogce/xpp3/1.1.6" UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xpp3-1.1.6.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.apache.httpcomponents/httpmime/4.2.5" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
<IMPORT NAME="httpclient-4.5.13.jar" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />

View File

@@ -49,7 +49,6 @@
<ITEM NAME="MYSQL" VALUE="MYSQL" />
<ITEM NAME="DBORACLE" VALUE="DBORACLE" />
<ITEM NAME="PARACCEL" VALUE="PARACCEL" />
<ITEM NAME="POSTGREPLUS" VALUE="POSTGREPLUS" />
<ITEM NAME="POSTGRE" VALUE="POSTGRE" />
<ITEM NAME="SQLITE" VALUE="SQLITE" />
<ITEM NAME="SYBASE" VALUE="SYBASE" />
@@ -63,7 +62,7 @@
<PARAMETER
NAME="CONNECTION_AS400"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tAS400Connection|tJDBCConnection$"
FILTER="REGEXP:^tAS400Connection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='AS400'"
@@ -73,7 +72,7 @@
<PARAMETER
NAME="CONNECTION_DB2"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tDB2Connection|tJDBCConnection$"
FILTER="REGEXP:^tDB2Connection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='DB2'"
@@ -83,7 +82,7 @@
<PARAMETER
NAME="CONNECTION_FIREBIRD"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tFirebirdConnection|tJDBCConnection$"
FILTER="REGEXP:^tFirebirdConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='FIREBIRD'"
@@ -93,7 +92,7 @@
<PARAMETER
NAME="CONNECTION_GREENPLUM"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tGreenplumConnection|tJDBCConnection$"
FILTER="REGEXP:^tGreenplumConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='GREENPLUM'"
@@ -103,7 +102,7 @@
<PARAMETER
NAME="CONNECTION_HIVE"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tHiveConnection|tJDBCConnection$"
FILTER="REGEXP:^tHiveConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='HIVE'"
@@ -113,7 +112,7 @@
<PARAMETER
NAME="CONNECTION_INGRES"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tIngresConnection|tJDBCConnection$"
FILTER="REGEXP:^tIngresConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='INGRES'"
@@ -123,7 +122,7 @@
<PARAMETER
NAME="CONNECTION_INTERBASE"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tInterbaseConnection|tJDBCConnection$"
FILTER="REGEXP:^tInterbaseConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='INTERBASE'"
@@ -133,7 +132,7 @@
<PARAMETER
NAME="CONNECTION_MSSQL"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tMSSqlConnection|tJDBCConnection$"
FILTER="REGEXP:^tMSSqlConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='MSSQL'"
@@ -143,7 +142,7 @@
<PARAMETER
NAME="CONNECTION_MYSQL"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tMysqlConnection|tJDBCConnection$"
FILTER="REGEXP:^tMysqlConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='MYSQL'"
@@ -153,7 +152,7 @@
<PARAMETER
NAME="CONNECTION_DBORACLE"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tOracleConnection|tJDBCConnection$"
FILTER="REGEXP:^tOracleConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='DBORACLE'"
@@ -163,27 +162,17 @@
<PARAMETER
NAME="CONNECTION_PARACCEL"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tParAccelConnection|tJDBCConnection$"
FILTER="REGEXP:^tParAccelConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='PARACCEL'"
/>
<!-- Postgreplus -->
<PARAMETER
NAME="CONNECTION_POSTGREPLUS"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tPostgresPlusConnection|tJDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='POSTGREPLUS'"
/>
/>
<!-- PostgreSQL -->
<PARAMETER
NAME="CONNECTION_POSTGRE"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tPostgresqlConnection|tJDBCConnection$"
FILTER="REGEXP:^tPostgresqlConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='POSTGRE'"
@@ -193,7 +182,7 @@
<PARAMETER
NAME="CONNECTION_SQLITE"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tSQLiteConnection|tJDBCConnection$"
FILTER="REGEXP:^tSQLiteConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='SQLITE'"
@@ -203,7 +192,7 @@
<PARAMETER
NAME="CONNECTION_SYBASE"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tSybaseConnection|tJDBCConnection$"
FILTER="REGEXP:^tSybaseConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='SYBASE'"
@@ -213,7 +202,7 @@
<PARAMETER
NAME="CONNECTION_TERADATA"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tTeradataConnection|tJDBCConnection$"
FILTER="REGEXP:^tTeradataConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='TERADATA'"
@@ -223,7 +212,7 @@
<PARAMETER
NAME="CONNECTION_VERTICA"
FIELD="COMPONENT_LIST"
FILTER="REGEXP:^tVerticaConnection|tJDBCConnection$"
FILTER="REGEXP:^tVerticaConnection|JDBCConnection$"
REQUIRED="true"
NUM_ROW="3"
SHOW_IF="DBTYPE=='VERTICA'"
@@ -247,7 +236,6 @@
<DEFAULT IF="DBTYPE=='MYSQL'">mysql_id</DEFAULT>
<DEFAULT IF="DBTYPE=='DBORACLE'">oracle_id</DEFAULT>
<DEFAULT IF="DBTYPE=='POSTGRE'">postgres_id</DEFAULT>
<DEFAULT IF="DBTYPE=='POSTGREPLUS'">postgresplus_id</DEFAULT>
<DEFAULT IF="DBTYPE=='SQLITE'">sqlite_id</DEFAULT>
<DEFAULT IF="DBTYPE=='PARACCEL'">paraccel_id</DEFAULT>
<DEFAULT IF="DBTYPE=='SYBASE'">sybase_id</DEFAULT>

View File

@@ -46,9 +46,9 @@
or (DBTYPE=='INGRES' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='INTERBASE' and USE_EXISTING_CONNECTION == 'true')
or (DBTYPE=='SQLITE' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='SYBASE' and USE_EXISTING_CONNECTION == 'true')
or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION == 'true')
or (DBTYPE=='POSTGREPLUS' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='ACCESS' and USE_EXISTING_CONNECTION == 'true')
or (DBTYPE=='GREENPLUM' and USE_EXISTING_CONNECTION == 'true')or (DBTYPE=='VERTICA' and USE_EXISTING_CONNECTION == 'true')
or (DBTYPE=='REDSHIFT' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='SNOWFLAKE' and USE_EXISTING_CONNECTION == 'true')"
or (DBTYPE=='ACCESS' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='GREENPLUM' and USE_EXISTING_CONNECTION == 'true')
or (DBTYPE=='VERTICA' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='REDSHIFT' and USE_EXISTING_CONNECTION == 'true')
or (DBTYPE=='SNOWFLAKE' and USE_EXISTING_CONNECTION == 'true')"
/>
<PARAMETER
@@ -74,7 +74,6 @@
<ITEM NAME="NETEZZA" VALUE="NETEZZA"/>
<ITEM NAME="ODBC" VALUE="ODBC"/>
<ITEM NAME="DBORACLE" VALUE="DBORACLE"/>
<ITEM NAME="POSTGREPLUS" VALUE="POSTGREPLUS"/>
<ITEM NAME="POSTGRE" VALUE="POSTGRE"/>
<ITEM NAME="REDSHIFT" VALUE="REDSHIFT"/>
<ITEM NAME="SNOWFLAKE" VALUE="SNOWFLAKE"/>
@@ -109,7 +108,7 @@
<PARAMETER NAME="USE_EXISTING_CONNECTION" FIELD="CHECK" NUM_ROW="30"
SHOW_IF="(DBTYPE=='MSSQL') or (DBTYPE=='MYSQL') or (DBTYPE=='DBORACLE') or (DBTYPE=='POSTGRE')
or (DBTYPE=='POSTGREPLUS') or (DBTYPE=='TERADATA') or (DBTYPE=='NETEZZA') or (DBTYPE=='AS400')
or (DBTYPE=='TERADATA') or (DBTYPE=='NETEZZA') or (DBTYPE=='AS400')
or (DBTYPE=='DB2') or (DBTYPE=='FIREBIRD') or (DBTYPE=='INFORMIX') or (DBTYPE=='INGRES')
or (DBTYPE=='SQLITE') or (DBTYPE=='SYBASE') or (DBTYPE=='ACCESS') or (DBTYPE=='GREENPLUM') or (DBTYPE=='VERTICA')
or (DBTYPE=='EXASOL') or (DBTYPE=='REDSHIFT') or (DBTYPE=='SNOWFLAKE')">
@@ -121,7 +120,7 @@
NOT_SHOW_IF="(DBTYPE=='ACCESS') or (DBTYPE=='SQLITE') or (DBTYPE == 'ODBC') or (DBTYPE == 'JAVADB' and FRAMEWORK_TYPE=='EMBEDED')
or (DBTYPE == 'HSQLDB' and RUNNING_MODE == 'HSQLDB_INPROGRESS_PERSISTENT') or (DBTYPE=='MYSQL' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='MSSQL' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='DBORACLE' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='POSTGREPLUS' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='AS400' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='DB2' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='FIREBIRD' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE')
@@ -138,7 +137,7 @@
NOT_SHOW_IF="(DBTYPE=='FIREBIRD') or (DBTYPE=='ACCESS') or (DBTYPE=='SQLITE') or (DBTYPE == 'HSQLDB')
or (DBTYPE == 'JAVADB') or (DBTYPE == 'ODBC') or (DBTYPE=='MYSQL' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='MSSQL' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='DBORACLE' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='POSTGREPLUS' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='AS400' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='DB2' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='INGRES' and USE_EXISTING_CONNECTION == 'true')
@@ -174,7 +173,7 @@
REPOSITORY_VALUE="USERNAME" REQUIRED="true"
NOT_SHOW_IF="(DBTYPE=='SQLITE') or (DBTYPE=='MSSQL' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='MYSQL' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='DBORACLE' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='POSTGREPLUS' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='AS400' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='DB2' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='FIREBIRD' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='INGRES' and USE_EXISTING_CONNECTION == 'true')
@@ -190,7 +189,7 @@
REPOSITORY_VALUE="PASSWORD" REQUIRED="true"
NOT_SHOW_IF="(DBTYPE=='SQLITE') or (DBTYPE=='MSSQL' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='MYSQL' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='DBORACLE' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='POSTGREPLUS' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='AS400' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='DB2' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='FIREBIRD' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='INGRES' and USE_EXISTING_CONNECTION == 'true')
@@ -211,7 +210,7 @@
NOT_SHOW_IF="(DBTYPE=='AS400') or (DBTYPE=='FIREBIRD') or (DBTYPE=='ACCESS') or (DBTYPE=='SQLITE') or (DBTYPE=='TERADATA')
or (DBTYPE=='MSSQL' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='MYSQL' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='DBORACLE' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='POSTGREPLUS' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE')
or (DBTYPE == 'JAVADB' and FRAMEWORK_TYPE=='EMBEDED') or (DBTYPE == 'ODBC')
or (DBTYPE == 'HSQLDB' and RUNNING_MODE == 'HSQLDB_INPROGRESS_PERSISTENT')
or (DBTYPE=='DB2' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE')
@@ -229,7 +228,7 @@
FIELD="TEXT"
NUM_ROW="70"
REPOSITORY_VALUE="SCHEMA"
SHOW_IF="(DBTYPE=='DBORACLE' or DBTYPE=='POSTGRE' or DBTYPE=='POSTGREPLUS' or DBTYPE=='INFORMIX' or DBTYPE=='DB2' or DBTYPE=='GREENPLUM' or DBTYPE=='VERTICA' or DBTYPE=='MSSQL' or DBTYPE=='SYBASE'
SHOW_IF="(DBTYPE=='DBORACLE' or DBTYPE=='POSTGRE' or DBTYPE=='INFORMIX' or DBTYPE=='DB2' or DBTYPE=='GREENPLUM' or DBTYPE=='VERTICA' or DBTYPE=='MSSQL' or DBTYPE=='SYBASE'
or DBTYPE=='EXASOL' or DBTYPE=='REDSHIFT' or DBTYPE=='SNOWFLAKE')
and (USE_EXISTING_CONNECTION == 'false')"
>
@@ -543,7 +542,7 @@
FIELD="CLOSED_LIST"
NUM_ROW="50"
REPOSITORY_VALUE="DB_VERSION"
SHOW_IF="((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) and (USE_EXISTING_CONNECTION == 'false')">
SHOW_IF="(DBTYPE=='POSTGRE') and (USE_EXISTING_CONNECTION == 'false')">
<ITEMS DEFAULT="V9_X">
<ITEM NAME="PRIOR_TO_V9" VALUE="PRIOR_TO_V9" />
<ITEM NAME="V9_X" VALUE="V9_X" />
@@ -560,17 +559,6 @@
</PARAMETER>
<!--Postgre configuration end-->
<!--PostgrePlus configuration start-->
<PARAMETER
NAME="CONNECTION_POSTGREPLUS"
FIELD="COMPONENT_LIST"
FILTER="tPostgresPlusConnection"
REQUIRED="true"
NUM_ROW="30"
SHOW_IF="(DBTYPE=='POSTGREPLUS') and (USE_EXISTING_CONNECTION == 'true')"
/>
<!--PostgrePlus configuration end-->
<!--SQLite configuration start-->
<PARAMETER
NAME="CONNECTION_SQLITE"
@@ -739,7 +727,6 @@
<DEFAULT IF="DBTYPE=='MYSQL'">mysql_id</DEFAULT>
<DEFAULT IF="DBTYPE=='DBORACLE'">oracle_id</DEFAULT>
<DEFAULT IF="DBTYPE=='POSTGRE'">postgres_id</DEFAULT>
<DEFAULT IF="DBTYPE=='POSTGREPLUS'">postgresplus_id</DEFAULT>
<DEFAULT IF="DBTYPE=='SQLITE'">sqlite_id</DEFAULT>
<DEFAULT IF="DBTYPE=='TERADATA'">teradata_id</DEFAULT>
<DEFAULT IF="DBTYPE=='NETEZZA'">netezza_id</DEFAULT>
@@ -865,12 +852,12 @@
<IMPORT NAME="Driver-MYSQL5" MODULE="mysql-connector-java-5.1.49.jar" MVN="mvn:mysql/mysql-connector-java/5.1.49" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') and (DBTYPE=='MYSQL') and (DB_MYSQL_VERSION=='MYSQL_5')"/>
<IMPORT NAME="Driver-MYSQL8" MODULE="mysql-connector-j-8.0.33.jar" MVN="mvn:com.mysql/mysql-connector-j/8.0.33" REQUIRED_IF="(DB_MYSQL_VERSION == 'MYSQL_8') AND (USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MYSQL')" />
<IMPORT NAME="Driver-MARIADB" MODULE="mariadb-java-client-3.1.4.jar" MVN="mvn:org.mariadb.jdbc/mariadb-java-client/3.1.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') and (DBTYPE=='MYSQL') and (DB_MYSQL_VERSION=='MARIADB')" />
<IMPORT NAME="Driver-Oracle11g" MODULE="ojdbc6.jar" MVN="mvn:org.talend.libraries/ojdbc6/6.0.0" REQUIRED_IF="(DBTYPE=='DBORACLE') AND (DB_VERSION == 'ORACLE_11') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Oracle11g" MODULE="ojdbc6-11.2.0.4.jar" MVN="mvn:com.oracle.database.jdbc/ojdbc6/11.2.0.4" REQUIRED_IF="(DBTYPE=='DBORACLE') AND (DB_VERSION == 'ORACLE_11') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Oracle12c" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0" REQUIRED_IF="(DBTYPE=='DBORACLE') AND (DB_VERSION == 'ORACLE_12') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="ORACLE_18" MODULE="ojdbc8-19.19.0.0.jar" MVN="mvn:com.oracle.database.jdbc/ojdbc8/19.19.0.0" REQUIRED_IF="(DBTYPE=='DBORACLE') AND (DB_VERSION == 'ORACLE_18') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-POSTGRESQL" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) AND (DB_POSTGRE_VERSION =='PRIOR_TO_V9')) or (DBTYPE=='GREENPLUM'))" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.6.0.jar" MVN="mvn:org.postgresql/postgresql/42.6.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) AND (DB_POSTGRE_VERSION =='V9_X'))" />
<IMPORT NAME="Driver-FIREBIRD" MODULE="jaybird-full-2.1.1.jar" MVN="mvn:org.talend.libraries/jaybird-full-2.1.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.jdbc.firebird/lib/jaybird-full-2.1.1.jar" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='FIREBIRD')" />
<IMPORT NAME="Driver-POSTGRESQL" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (((DBTYPE=='POSTGRE') AND (DB_POSTGRE_VERSION =='PRIOR_TO_V9')) or (DBTYPE=='GREENPLUM'))" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.6.0.jar" MVN="mvn:org.postgresql/postgresql/42.6.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((DBTYPE=='POSTGRE') AND (DB_POSTGRE_VERSION =='V9_X'))" />
<IMPORT NAME="Driver-FIREBIRD" MODULE="jaybird-2.1.1.jar" MVN="mvn:net.sf.squirrel-sql.thirdparty-non-maven/jaybird/2.1.1" UrlPath="platform:/plugin/org.talend.libraries.jdbc.firebird/lib/jaybird-full-2.1.1.jar" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='FIREBIRD')" />
<IMPORT NAME="Driver-HSQLDb" MODULE="hsqldb-2.7.1.jar" MVN="mvn:org.hsqldb/hsqldb/2.7.1" REQUIRED_IF="DBTYPE=='HSQLDB'"/>
<IMPORT NAME="Driver-INFORMIX-JDBC" MODULE="ifxjdbc.jar" MVN="mvn:org.talend.libraries/ifxjdbc/6.0.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INFORMIX')" />
<IMPORT NAME="Driver-INFORMIX-JDBCX" MODULE="ifxjdbcx.jar" MVN="mvn:org.talend.libraries/ifxjdbcx/6.0.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INFORMIX')" />
@@ -879,9 +866,9 @@
<IMPORT NAME="Driver-INFORMIX-SQLJ" MODULE="ifxsqlj.jar" MVN="mvn:org.talend.libraries/ifxsqlj/6.0.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INFORMIX')" />
<IMPORT NAME="Driver-INFORMIX-TOOLS" MODULE="ifxtools.jar" MVN="mvn:org.talend.libraries/ifxtools/6.0.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INFORMIX')"/>
<IMPORT NAME="Driver-Ingres" MODULE="iijdbc-10.2-4.1.10.jar" MVN="mvn:com.ingres.jdbc/iijdbc/10.2-4.1.10" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INGRES')"/>
<IMPORT NAME="Driver-JAVADB-DERBY" MODULE="derby.jar" MVN="mvn:org.talend.libraries/derby/6.0.0" REQUIRED_IF="DBTYPE=='JAVADB'"/>
<IMPORT NAME="Driver-JAVADB-DERBYCLIENT" MODULE="derbyclient.jar" MVN="mvn:org.talend.libraries/derbyclient/6.0.0" REQUIRED_IF="DBTYPE=='JAVADB'"/>
<IMPORT NAME="Driver-JAVADB-DERBYNET" MODULE="derbynet.jar" MVN="mvn:org.talend.libraries/derbynet/6.0.0" REQUIRED_IF="DBTYPE=='JAVADB'"/>
<IMPORT NAME="Driver-JAVADB-DERBY" MODULE="derby-10.14.2.0.jar" MVN="mvn:org.apache.derby/derby/10.14.2.0" REQUIRED_IF="DBTYPE=='JAVADB'"/>
<IMPORT NAME="Driver-JAVADB-DERBYCLIENT" MODULE="derbyclient-10.14.2.0.jar" MVN="mvn:org.apache.derby/derbyclient/10.14.2.0" REQUIRED_IF="DBTYPE=='JAVADB'"/>
<IMPORT NAME="Driver-JAVADB-DERBYNET" MODULE="derbynet-10.14.2.0.jar" MVN="mvn:org.apache.derby/derbynet/10.14.2.0" REQUIRED_IF="DBTYPE=='JAVADB'"/>
<IMPORT NAME="Driver-SQLite" MODULE="sqlite-jdbc-3.40.0.0.jar" MVN="mvn:org.xerial/sqlite-jdbc/3.40.0.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='SQLITE')" />
<IMPORT NAME="Driver-SYBASE-JCONN3" MODULE="jconn3.jar" MVN="mvn:org.talend.libraries/jconn3/6.0.0" BundleID="" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='SYBASE') AND (DB_SYBASE_VERSION == 'SYBSEIQ_12_15')" />
<IMPORT NAME="Driver-SYBASE-JCONN4" MODULE="jconn4.jar" MVN="mvn:org.talend.libraries/jconn4/6.0.0" BundleID="" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='SYBASE') AND (DB_SYBASE_VERSION == 'SYBSEIQ_16')" />

View File

@@ -176,7 +176,7 @@ abstract class Manager {
}
createTableSQL.append(suffix);
} else {
boolean isPostgresishDB = ("postgres_id".equalsIgnoreCase(getDBMSId()) || "postgresplus_id".equalsIgnoreCase(getDBMSId()) || "greenplum_id".equalsIgnoreCase(getDBMSId()) );
boolean isPostgresishDB = ("postgres_id".equalsIgnoreCase(getDBMSId()) || "greenplum_id".equalsIgnoreCase(getDBMSId()) );
if(!lengthIgnored) {
if (isPostgresishDB && metadataColumn.getLength() == null) {
}else {
@@ -1354,69 +1354,6 @@ class PostgreManager extends Manager {
return javaCode.toString();
}
}
class PostgrePlusManager extends Manager {
private String host;
private String port;
private String dbSchema;
private boolean useExistingConnection;
private String connection;
public PostgrePlusManager(String host, String port, String dbName, String tableName, String dbSchema, String userName, boolean useExistingConnection, String connection, String cid, String additionalParams) {
super(dbName, tableName, userName, cid, additionalParams);
this.host = host;
this.port = port;
this.dbSchema = dbSchema;
this.useExistingConnection = useExistingConnection;
this.connection = connection;
}
protected String getDriver() {
return "org.postgresql.Driver";
}
public String getSpecificConnectionURL() {
return "\"jdbc:postgresql://\" + " + host + " + \":\" + " + port + " + \"/\" + " + dbName;
}
public String getConnection() {
StringBuilder javaCode = new StringBuilder();
if(useExistingConnection) {
javaCode.append(retrieveTable());
javaCode.append("java.sql.Connection conn_" + cid + " = (java.sql.Connection)globalMap.get(\"conn_" + connection + "\");");
} else {
javaCode.append(super.getConnection());
}
return javaCode.toString();
}
protected String getDBMSId() {
return "postgresplus_id";
}
protected String getLProtectedChar() {
return "\\\"";
}
protected String getRProtectedChar() {
return "\\\"";
}
public String closeConnection() {
StringBuilder javaCode = new StringBuilder();
if(useExistingConnection) {
javaCode.append("");
} else {
javaCode.append(super.closeConnection());
}
return javaCode.toString();
}
protected String retrieveTable() {
StringBuilder javaCode = new StringBuilder();
javaCode.append(super.retrieveTable());
if(useExistingConnection) {
javaCode.append("String dbSchema_" + cid + " = (String)globalMap.get(\"schema_" + connection + "\");\r\n");
} else {
javaCode.append("String dbSchema_" + cid + " = " + dbSchema + ";\r\n");
}
javaCode.append("if(dbSchema_" + cid + " != null && dbSchema_" + cid + ".trim().length() != 0) {");
javaCode.append("tableName_" + cid + " = dbSchema_" + cid + " + \"" + getLProtectedChar() + "." + getRProtectedChar() + "\" + tableName_" + cid + ";\r\n");
javaCode.append("}");
return javaCode.toString();
}
}
class SQLiteManager extends Manager {
private boolean useExistingConnection;
private String connection;
@@ -1695,7 +1632,7 @@ class TeradataManager extends Manager {
createTableSQL.append(suffix);
} else {
if(!lengthIgnored) {
if (("postgres_id".equalsIgnoreCase(getDBMSId()) || "postgresplus_id".equalsIgnoreCase(getDBMSId()) || "greenplum_id".equalsIgnoreCase(getDBMSId()) ) && metadataColumn.getLength() == null) {
if (("postgres_id".equalsIgnoreCase(getDBMSId()) || "greenplum_id".equalsIgnoreCase(getDBMSId()) ) && metadataColumn.getLength() == null) {
}else {
prefix = "(";
suffix = ") ";
@@ -1714,7 +1651,7 @@ class TeradataManager extends Manager {
createTableSQL.append(comma + precision);
}
if (("postgres_id".equalsIgnoreCase(getDBMSId()) || "postgresplus_id".equalsIgnoreCase(getDBMSId()) ||"greenplum_id".equalsIgnoreCase(getDBMSId()) ) && metadataColumn.getLength() == null) {
if (("postgres_id".equalsIgnoreCase(getDBMSId()) ||"greenplum_id".equalsIgnoreCase(getDBMSId()) ) && metadataColumn.getLength() == null) {
} else {
createTableSQL.append(suffix);
}
@@ -2339,15 +2276,6 @@ class ManagerFactory {
boolean tempTable = ("true").equals(ElementParameterParser.getValue(node, "__TEMPTABLE__"));
boolean unloggedTable = ("true").equals(ElementParameterParser.getValue(node, "__UNLOGGED__"));
manager = new PostgreManager(host, port, dbName, tableName, dbSchema, userName, useExistingConnection, connection, cid, tempTable, unloggedTable, additionalParams);
} else if(("POSTGREPLUS").equals(dbType)) {
String host = ElementParameterParser.getValue(node, "__HOST__");
String port = ElementParameterParser.getValue(node, "__PORT__");
String dbSchema = ElementParameterParser.getValue(node, "__SCHEMA_DB__");
String dbName = ElementParameterParser.getValue(node, "__DBNAME__");
String userName = ElementParameterParser.getValue(node, "__USER__");
boolean useExistingConnection = ("true").equals(ElementParameterParser.getValue(node, "__USE_EXISTING_CONNECTION__"));
String connection = stringUtil.getString(ElementParameterParser.getValue(node, "__CONNECTION_POSTGREPLUS__"));
manager = new PostgrePlusManager(host, port, dbName, tableName, dbSchema, userName, useExistingConnection, connection, cid, additionalParams);
} else if(("SQLITE").equals(dbType)) {
String dbName = ElementParameterParser.getValue(node, "__DBFILE_SQLITE__");
String userName = ElementParameterParser.getValue(node, "__USER__");
@@ -2446,7 +2374,7 @@ if(columnList != null && columnList.size() > 0) {
String cid = node.getUniqueName();
boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.getProcess(), "__LOG4J_ACTIVATE__"));
boolean tableNameCaseSensitive=false;
if("DB2".equalsIgnoreCase(dbType)||"POSTGRE".equalsIgnoreCase(dbType)||"POSTGREPLUS".equalsIgnoreCase(dbType)||"GREENPLUM".equalsIgnoreCase(dbType)){
if("DB2".equalsIgnoreCase(dbType)||"POSTGRE".equalsIgnoreCase(dbType)||"GREENPLUM".equalsIgnoreCase(dbType)){
tableNameCaseSensitive=true;
}
if(("HSQLDB").equals(dbType)){
@@ -2555,7 +2483,7 @@ if(columnList != null && columnList.size() > 0) {
}
}
<%
} else if ("GREENPLUM".equalsIgnoreCase(dbType) || "POSTGRE".equalsIgnoreCase(dbType) || "POSTGREPLUS".equalsIgnoreCase(dbType)) {
} else if ("GREENPLUM".equalsIgnoreCase(dbType) || "POSTGRE".equalsIgnoreCase(dbType)) {
if ("true".equals(ElementParameterParser.getValue(node, "__TEMPTABLE__"))) {
%>
java.sql.PreparedStatement tempTablePs_<%=cid %> = conn_<%=cid %>.prepareStatement("SELECT * FROM information_schema.tables WHERE table_type='LOCAL TEMPORARY' AND table_name = ?");

View File

@@ -45,7 +45,7 @@ SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=Bool\u00E9en
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=Octet
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Bytes
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Octets
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=Date
SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=Double

View File

@@ -58,7 +58,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="dropbox-core-sdk"
MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0"
MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:com.dropbox.core/dropbox-core-sdk/2.1.2"
REQUIRED="true" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"

View File

@@ -68,7 +68,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="dropbox-core-sdk"
MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0"
MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:com.dropbox.core/dropbox-core-sdk/2.1.2"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"

View File

@@ -82,7 +82,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="dropbox-core-sdk"
MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0"
MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:com.dropbox.core/dropbox-core-sdk/2.1.2"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"

View File

@@ -80,7 +80,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="dropbox-core-sdk"
MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0"
MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:com.dropbox.core/dropbox-core-sdk/2.1.2"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"

View File

@@ -107,7 +107,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="dropbox-core-sdk"
MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0"
MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:com.dropbox.core/dropbox-core-sdk/2.1.2"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.14.3.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.14.3"

View File

@@ -104,79 +104,79 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="d00a-mapping-1.4" MODULE="d00a-mapping-1.4-20101230.181140-1.jar" MVN="mvn:org.talend.libraries/d00a-mapping-1.4-20101230.181140-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d00a-mapping-1.4-20101230.181140-1.jar"
REQUIRED="true" />
<IMPORT NAME="d00b-mapping-1.4" MODULE="d00b-mapping-1.4-20101230.182448-1.jar" MVN="mvn:org.talend.libraries/d00b-mapping-1.4-20101230.182448-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d00b-mapping-1.4-20101230.182448-1.jar"
REQUIRED="true" />
<IMPORT NAME="d01a-mapping-1.4" MODULE="d01a-mapping-1.4-20101230.183534-1.jar" MVN="mvn:org.talend.libraries/d01a-mapping-1.4-20101230.183534-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d01a-mapping-1.4-20101230.183534-1.jar"
REQUIRED="true" />
<IMPORT NAME="d01b-mapping-1.4" MODULE="d01b-mapping-1.4-20101230.185159-1.jar" MVN="mvn:org.talend.libraries/d01b-mapping-1.4-20101230.185159-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d01b-mapping-1.4-20101230.185159-1.jar"
REQUIRED="true" />
<IMPORT NAME="d01c-mapping-1.4" MODULE="d01c-mapping-1.4-20101230.190625-1.jar" MVN="mvn:org.talend.libraries/d01c-mapping-1.4-20101230.190625-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d01c-mapping-1.4-20101230.190625-1.jar"
REQUIRED="true" />
<IMPORT NAME="d02a-mapping-1.4" MODULE="d02a-mapping-1.4-20101230.191840-1.jar" MVN="mvn:org.talend.libraries/d02a-mapping-1.4-20101230.191840-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d02a-mapping-1.4-20101230.191840-1.jar"
REQUIRED="true" />
<IMPORT NAME="d02b-mapping-1.4" MODULE="d02b-mapping-1.4-20101230.193459-1.jar" MVN="mvn:org.talend.libraries/d02b-mapping-1.4-20101230.193459-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d02b-mapping-1.4-20101230.193459-1.jar"
REQUIRED="true" />
<IMPORT NAME="d03a-mapping-1.4" MODULE="d03a-mapping-1.4-20101230.195010-1.jar" MVN="mvn:org.talend.libraries/d03a-mapping-1.4-20101230.195010-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d03a-mapping-1.4-20101230.195010-1.jar"
REQUIRED="true" />
<IMPORT NAME="d03b-mapping-1.4" MODULE="d03b-mapping-1.4-20101230.201023-1.jar" MVN="mvn:org.talend.libraries/d03b-mapping-1.4-20101230.201023-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d03b-mapping-1.4-20101230.201023-1.jar"
REQUIRED="true" />
<IMPORT NAME="d04a-mapping-1.4" MODULE="d04a-mapping-1.4-20101230.202950-1.jar" MVN="mvn:org.talend.libraries/d04a-mapping-1.4-20101230.202950-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d04a-mapping-1.4-20101230.202950-1.jar"
REQUIRED="true" />
<IMPORT NAME="d04b-mapping-1.4" MODULE="d04b-mapping-1.4-20101230.204717-1.jar" MVN="mvn:org.talend.libraries/d04b-mapping-1.4-20101230.204717-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d04b-mapping-1.4-20101230.204717-1.jar"
REQUIRED="true" />
<IMPORT NAME="d05a-mapping-1.4" MODULE="d05a-mapping-1.4-20101230.210746-1.jar" MVN="mvn:org.talend.libraries/d05a-mapping-1.4-20101230.210746-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d05a-mapping-1.4-20101230.210746-1.jar"
REQUIRED="true" />
<IMPORT NAME="d05b-mapping-1.4" MODULE="d05b-mapping-1.4-20101230.212643-1.jar" MVN="mvn:org.talend.libraries/d05b-mapping-1.4-20101230.212643-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d05b-mapping-1.4-20101230.212643-1.jar"
REQUIRED="true" />
<IMPORT NAME="d06a-mapping-1.4" MODULE="d06a-mapping-1.4-20101230.214557-1.jar" MVN="mvn:org.talend.libraries/d06a-mapping-1.4-20101230.214557-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d06a-mapping-1.4-20101230.214557-1.jar"
REQUIRED="true" />
<IMPORT NAME="d06b-mapping-1.4" MODULE="d06b-mapping-1.4-20101230.220647-1.jar" MVN="mvn:org.talend.libraries/d06b-mapping-1.4-20101230.220647-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d06b-mapping-1.4-20101230.220647-1.jar"
REQUIRED="true" />
<IMPORT NAME="d07a-mapping-1.4" MODULE="d07a-mapping-1.4-20101230.222824-1.jar" MVN="mvn:org.talend.libraries/d07a-mapping-1.4-20101230.222824-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d07a-mapping-1.4-20101230.222824-1.jar"
REQUIRED="true" />
<IMPORT NAME="d07b-mapping-1.4" MODULE="d07b-mapping-1.4-20101230.224645-1.jar" MVN="mvn:org.talend.libraries/d07b-mapping-1.4-20101230.224645-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d07b-mapping-1.4-20101230.224645-1.jar"
REQUIRED="true" />
<IMPORT NAME="d08a-mapping-1.4" MODULE="d08a-mapping-1.4-20101230.230844-1.jar" MVN="mvn:org.talend.libraries/d08a-mapping-1.4-20101230.230844-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d08a-mapping-1.4-20101230.230844-1.jar"
REQUIRED="true" />
<IMPORT NAME="d08b-mapping-1.4" MODULE="d08b-mapping-1.4-20101230.231449-1.jar" MVN="mvn:org.talend.libraries/d08b-mapping-1.4-20101230.231449-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d08b-mapping-1.4-20101230.231449-1.jar"
REQUIRED="true" />
<IMPORT NAME="d09a-mapping-1.4" MODULE="d09a-mapping-1.4-20101230.233910-1.jar" MVN="mvn:org.talend.libraries/d09a-mapping-1.4-20101230.233910-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d09a-mapping-1.4-20101230.233910-1.jar"
REQUIRED="true" />
<IMPORT NAME="d09b-mapping-1.4" MODULE="d09b-mapping-1.4-20101231.000627-1.jar" MVN="mvn:org.talend.libraries/d09b-mapping-1.4-20101231.000627-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d09b-mapping-1.4-20101231.000627-1.jar"
REQUIRED="true" />
<IMPORT NAME="d93a-mapping-1.4" MODULE="d93a-mapping-1.4-20101231.003027-1.jar" MVN="mvn:org.talend.libraries/d93a-mapping-1.4-20101231.003027-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d93a-mapping-1.4-20101231.003027-1.jar"
REQUIRED="true" />
<IMPORT NAME="d94a-mapping-1.4" MODULE="d94a-mapping-1.4-20101231.004159-1.jar" MVN="mvn:org.talend.libraries/d94a-mapping-1.4-20101231.004159-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d94a-mapping-1.4-20101231.004159-1.jar"
REQUIRED="true" />
<IMPORT NAME="d94b-mapping-1.4" MODULE="d94b-mapping-1.4-20101231.005548-1.jar" MVN="mvn:org.talend.libraries/d94b-mapping-1.4-20101231.005548-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d94b-mapping-1.4-20101231.005548-1.jar"
REQUIRED="true" />
<IMPORT NAME="d95a-mapping-1.4" MODULE="d95a-mapping-1.4-20101231.010614-1.jar" MVN="mvn:org.talend.libraries/d95a-mapping-1.4-20101231.010614-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d95a-mapping-1.4-20101231.010614-1.jar"
REQUIRED="true" />
<IMPORT NAME="d95b-mapping-1.4" MODULE="d95b-mapping-1.4-20101231.012144-1.jar" MVN="mvn:org.talend.libraries/d95b-mapping-1.4-20101231.012144-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d95b-mapping-1.4-20101231.012144-1.jar"
REQUIRED="true" />
<IMPORT NAME="d96a-mapping-1.4" MODULE="d96a-mapping-1.4-20101231.013900-1.jar" MVN="mvn:org.talend.libraries/d96a-mapping-1.4-20101231.013900-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d96a-mapping-1.4-20101231.013900-1.jar"
REQUIRED="true" />
<IMPORT NAME="d96b-mapping-1.4" MODULE="d96b-mapping-1.4-20101231.015118-1.jar" MVN="mvn:org.talend.libraries/d96b-mapping-1.4-20101231.015118-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d96b-mapping-1.4-20101231.015118-1.jar"
REQUIRED="true" />
<IMPORT NAME="d97a-mapping-1.4" MODULE="d97a-mapping-1.4-20101231.020712-1.jar" MVN="mvn:org.talend.libraries/d97a-mapping-1.4-20101231.020712-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d97a-mapping-1.4-20101231.020712-1.jar"
REQUIRED="true" />
<IMPORT NAME="d97b-mapping-1.4" MODULE="d97b-mapping-1.4-20101231.022307-1.jar" MVN="mvn:org.talend.libraries/d97b-mapping-1.4-20101231.022307-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d97b-mapping-1.4-20101231.022307-1.jar"
REQUIRED="true" />
<IMPORT NAME="d98a-mapping-1.4" MODULE="d98a-mapping-1.4-20101231.023634-1.jar" MVN="mvn:org.talend.libraries/d98a-mapping-1.4-20101231.023634-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d98a-mapping-1.4-20101231.023634-1.jar"
REQUIRED="true" />
<IMPORT NAME="d98b-mapping-1.4" MODULE="d98b-mapping-1.4-20101231.025003-1.jar" MVN="mvn:org.talend.libraries/d98b-mapping-1.4-20101231.025003-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d98b-mapping-1.4-20101231.025003-1.jar"
REQUIRED="true" />
<IMPORT NAME="d99a-mapping-1.4" MODULE="d99a-mapping-1.4-20101231.030914-1.jar" MVN="mvn:org.talend.libraries/d99a-mapping-1.4-20101231.030914-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d99a-mapping-1.4-20101231.030914-1.jar"
REQUIRED="true" />
<IMPORT NAME="d99b-mapping-1.4" MODULE="d99b-mapping-1.4-20101231.032348-1.jar" MVN="mvn:org.talend.libraries/d99b-mapping-1.4-20101231.032348-1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.edifact/lib/d99b-mapping-1.4-20101231.032348-1.jar"
REQUIRED="true" />
<IMPORT NAME="d00a-mapping-1.4" MODULE="d00a-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d00a-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d00b-mapping-1.4" MODULE="d00b-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d00b-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d01a-mapping-1.4" MODULE="d01a-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d01a-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d01b-mapping-1.4" MODULE="d01b-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d01b-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d01c-mapping-1.4" MODULE="d01c-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d01c-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d02a-mapping-1.4" MODULE="d02a-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d02a-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d02b-mapping-1.4" MODULE="d02b-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d02b-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d03a-mapping-1.4" MODULE="d03a-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d03a-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d03b-mapping-1.4" MODULE="d03b-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d03b-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d04a-mapping-1.4" MODULE="d04a-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d04a-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d04b-mapping-1.4" MODULE="d04b-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d04b-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d05a-mapping-1.4" MODULE="d05a-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d05a-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d05b-mapping-1.4" MODULE="d05b-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d05b-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d06a-mapping-1.4" MODULE="d06a-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d06a-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d06b-mapping-1.4" MODULE="d06b-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d06b-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d07a-mapping-1.4" MODULE="d07a-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d07a-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d07b-mapping-1.4" MODULE="d07b-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d07b-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d08a-mapping-1.4" MODULE="d08a-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d08a-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d08b-mapping-1.4" MODULE="d08b-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d08b-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d09a-mapping-1.4" MODULE="d09a-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d09a-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d09b-mapping-1.4" MODULE="d09b-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d09b-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d93a-mapping-1.4" MODULE="d93a-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d93a-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d94a-mapping-1.4" MODULE="d94a-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d94a-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d94b-mapping-1.4" MODULE="d94b-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d94b-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d95a-mapping-1.4" MODULE="d95a-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d95a-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d95b-mapping-1.4" MODULE="d95b-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d95b-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d96a-mapping-1.4" MODULE="d96a-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d96a-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d96b-mapping-1.4" MODULE="d96b-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d96b-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d97a-mapping-1.4" MODULE="d97a-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d97a-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d97b-mapping-1.4" MODULE="d97b-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d97b-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d98a-mapping-1.4" MODULE="d98a-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d98a-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d98b-mapping-1.4" MODULE="d98b-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d98b-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d99a-mapping-1.4" MODULE="d99a-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d99a-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="d99b-mapping-1.4" MODULE="d99b-mapping-1.4.jar" MVN="mvn:org.milyn.edi.unedifact/d99b-mapping/1.4"
REQUIRED="true" />
<IMPORT NAME="mylin-smooks" MODULE="milyn-smooks-all-1.7.0.jar" MVN="mvn:org.talend.libraries/milyn-smooks-all-1.7.0/6.0.0"
REQUIRED="true" />
<IMPORT NAME="jaxen" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" BundleID="org.apache.servicemix.bundles.jaxen"
REQUIRED="true" />
<IMPORT NAME="commons-logging" MODULE="commons-logging-1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.jar"
<IMPORT NAME="commons-logging" MODULE="commons-logging-1.1.jar" MVN="mvn:commons-logging/commons-logging/1.1" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.jar"
REQUIRED="true" />
<IMPORT NAME="commons-collections" MODULE="commons-collections-3.2.2.jar" MVN="mvn:commons-collections/commons-collections/3.2.2" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-3.2.2.jar"
REQUIRED="true" />

View File

@@ -23,7 +23,7 @@ imports="
String ignoreNewLines = ElementParameterParser.getValue(node, "__IGNORE_NEW_LINE__");
%>
String modelURI_<%=cid%> = "urn:org.milyn.edi.unedifact:"+"<%=version%>"+"-mapping:1.4-SNAPSHOT";
String modelURI_<%=cid%> = "urn:org.milyn.edi.unedifact:"+"<%=version%>"+"-mapping:1.4";
org.milyn.edisax.unedifact.UNEdifactInterchangeParser parser_<%=cid%> = new org.milyn.edisax.unedifact.UNEdifactInterchangeParser();

View File

@@ -56,7 +56,7 @@
<PARAMETER
NAME="CONNECTION"
FIELD="COMPONENT_LIST"
REQUIRED="true" FILTER="REGEXP:^tJDBCConnection|tSnowflakeConnection|tSAPHanaConnection|tDeltaLakeConnection$"
REQUIRED="true" FILTER="REGEXP:^JDBCConnection|tSnowflakeConnection|tSAPHanaConnection|tDeltaLakeConnection$"
NUM_ROW="2"
SHOW_IF="(#LINK@CONNECTOR.OUT.TABLE_REF == '0') AND (USE_EXISTING_CONNECTION == 'true')"
DYNAMIC_SETTINGS="true"/>

View File

@@ -221,7 +221,7 @@
} else if("MYSQL".equals(dbType)){
return "`";
}
String[] array_types = new String[]{"DB2","GREENPLUM","POSTGRE","POSTGREPLUS","PARACCEL","INGRES","SQLITE","TERADATA","INTERBASE"};
String[] array_types = new String[]{"DB2","GREENPLUM","POSTGRE","PARACCEL","INGRES","SQLITE","TERADATA","INTERBASE"};
for(String db :array_types){
if(db.equals(dbType)){
return "\\\"";

View File

@@ -259,7 +259,7 @@
<IMPORTS>
<IMPORT NAME="ORACLE_18" MODULE="ojdbc8-19.19.0.0.jar" MVN="mvn:com.oracle.database.jdbc/ojdbc8/19.19.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_18') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="ORACLE_12" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_12') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="ORACLE_11" MODULE="ojdbc6.jar" MVN="mvn:org.talend.libraries/ojdbc6/6.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_11') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="ORACLE_11" MODULE="ojdbc6-11.2.0.4.jar" MVN="mvn:com.oracle.database.jdbc/ojdbc6/11.2.0.4" REQUIRED_IF="(DB_VERSION == 'ORACLE_11') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -184,15 +184,15 @@
<IMPORT NAME="Java_JAXEN_1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
<IMPORT NAME="json-lib" MODULE="json-lib-2.4.8-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.8-talend" REQUIRED_IF="READ_BY == 'XPATH'" />
<IMPORT NAME="commons_lang" 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="READ_BY == 'XPATH'" />
<IMPORT NAME="commons_logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0" UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
<IMPORT NAME="ezmorph" MODULE="ezmorph-1.0.6.jar" MVN="mvn:org.talend.libraries/ezmorph-1.0.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.jackson/lib/ezmorph-1.0.6.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
<IMPORT NAME="commons_logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:commons-logging/commons-logging/1.1.1" UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
<IMPORT NAME="ezmorph" MODULE="ezmorph-1.0.6.jar" MVN="mvn:net.sf.ezmorph/ezmorph/1.0.6" UrlPath="platform:/plugin/org.talend.libraries.jackson/lib/ezmorph-1.0.6.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
<IMPORT NAME="xom" MODULE="xom-1.2.7.jar" MVN="mvn:org.talend.libraries/xom-1.2.7/6.0.0" REQUIRED_IF="READ_BY == 'XPATH'" />
<IMPORT NAME="commons_beanutils" MODULE="commons-beanutils-1.9.4.jar" MVN="mvn:commons-beanutils/commons-beanutils/1.9.4" REQUIRED_IF="READ_BY == 'XPATH'" />
<IMPORT NAME="commons_collections" MODULE="commons-collections-3.2.2.jar" MVN="mvn:commons-collections/commons-collections/3.2.2" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-3.2.2.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
<IMPORT NAME="staxon" MODULE="staxon-1.2.jar" MVN="mvn:org.talend.libraries/staxon-1.2/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.json/lib/staxon-1.2.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
<IMPORT NAME="staxon" MODULE="staxon-1.2.jar" MVN="mvn:de.odysseus.staxon/staxon/1.2" UrlPath="platform:/plugin/org.talend.libraries.json/lib/staxon-1.2.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
<IMPORT NAME="json-path-2.1.0.jar" MODULE="json-path-2.1.0.jar" MVN="mvn:org.talend.libraries/json-path-2.1.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.json/lib/json-path-2.1.0.jar" REQUIRED_IF="(READ_BY == 'JSONPATH') AND (JSON_PATH_VERSION == '2_1_0')" />
<IMPORT NAME="json-path-1.2.0.jar" MODULE="json-path-1.2.0.jar" MVN="mvn:org.talend.libraries/json-path-1.2.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.json/lib/json-path-1.2.0.jar" REQUIRED_IF="(READ_BY == 'JSONPATH') AND (JSON_PATH_VERSION == '1_2_0')" />
<IMPORT NAME="json-path-2.1.0.jar" MODULE="json-path-2.1.0.jar" MVN="mvn:com.jayway.jsonpath/json-path/2.1.0" UrlPath="platform:/plugin/org.talend.libraries.json/lib/json-path-2.1.0.jar" REQUIRED_IF="(READ_BY == 'JSONPATH') AND (JSON_PATH_VERSION == '2_1_0')" />
<IMPORT NAME="json-path-1.2.0.jar" MODULE="json-path-1.2.0.jar" MVN="mvn:com.jayway.jsonpath/json-path/1.2.0" UrlPath="platform:/plugin/org.talend.libraries.json/lib/json-path-1.2.0.jar" REQUIRED_IF="(READ_BY == 'JSONPATH') AND (JSON_PATH_VERSION == '1_2_0')" />
<IMPORT NAME="json-smart-2.4.11.jar" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11" REQUIRED_IF="READ_BY == 'JSONPATH'" />
<IMPORT NAME="accessors-smart-2.4.11.jar" MODULE="accessors-smart-2.4.11.jar" MVN="mvn:net.minidev/accessors-smart/2.4.11" REQUIRED_IF="READ_BY == 'JSONPATH'" />

View File

@@ -346,7 +346,15 @@ COMPATIBILITY="ALL"
NUM_ROW="100" SHOW_IF="USE_EXISTING_CONNECTION == 'false'" REPOSITORY_VALUE="USE_STRICT_REPLY_PARSING">
<DEFAULT>true</DEFAULT>
</PARAMETER>
<PARAMETER
NAME="RENAME_AFTER"
FIELD="CHECK"
NUM_ROW="105"
SHOW="true"
>
<DEFAULT>false</DEFAULT>
</PARAMETER>
<PARAMETER
NAME="CONFIG_CLIENT"
FIELD="CHECK"

View File

@@ -21,6 +21,7 @@
String connection = ElementParameterParser.getValue(node, "__CONNECTION__");
String useExistingConn = ElementParameterParser.getValue(node, "__USE_EXISTING_CONNECTION__");
boolean sftp = false;
boolean renameAfterUpload = ("true").equals(ElementParameterParser.getValue(node, "__RENAME_AFTER__"));
boolean ftps = false;
boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.getProcess(), "__LOG4J_ACTIVATE__"));
boolean useGlob = ("true").equals(ElementParameterParser.getValue(node, "__PERL5_REGEX__"));
@@ -105,12 +106,21 @@ try{
}
String destRename_<%= cid %> = map<%=cid %>.get(key<%=cid %>);
final String dest_<%=cid%>;
if (destRename_<%= cid %> == null || destRename_<%= cid %>.isEmpty()) {
dest_<%=cid%> = remoteDir_<%=cid%> + "/" + listings<%=cid %>[m<%=cid %>].getName();
}
else {
dest_<%=cid%> = remoteDir_<%=cid%> + "/" + destRename_<%= cid %>;
}
<%
if (renameAfterUpload) {
%>
dest_<%=cid%> = remoteDir_<%=cid%>+"/"+listings<%=cid %>[m<%=cid %>].getName();
<%
} else {
%>
if (destRename_<%= cid %> == null || destRename_<%= cid %>.isEmpty()) {
dest_<%=cid%> = remoteDir_<%=cid%> + "/" + listings<%=cid %>[m<%=cid %>].getName();
} else {
dest_<%=cid%> = remoteDir_<%=cid%> + "/" + destRename_<%= cid %>;
}
<%
}
%>
try{
c_<%=cid%>.put(listings<%=cid %>[m<%=cid %>].getAbsolutePath(), dest_<%=cid%>, monitor<%=cid%>, mode<%=cid%>);
@@ -171,6 +181,32 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e_<%=cid%>.getMessage());
<%}%>
System.err.println("No matches found for mask '" + key<%=cid %> + "'!");
}
<%
if (renameAfterUpload) {
%>
//do rename
if (!((map<%=cid %>.get(key<%=cid %>) == null) || map<%=cid %>.get(key<%=cid %>).isEmpty() || key<%=cid %>.equals(map<%=cid %>.get(key<%=cid %>)))){
<%
if(("overwrite").equals(sftpoverwrite) || ("resume").equals(sftpoverwrite)){
%>
try{
c_<%=cid%>.rm(<%=remotedir %>+"/"+map<%=cid %>.get(key<%=cid %>));
}catch(com.jcraft.jsch.SftpException e_<%=cid%>){
}
<%
}
%>
try{
c_<%=cid%>.rename(<%=remotedir %>+"/"+key<%=cid %>, <%=remotedir %>+"/"+map<%=cid %>.get(key<%=cid %>));
globalMap.put("<%=cid %>_CURRENT_STATUS", "File rename OK.");
}catch(com.jcraft.jsch.SftpException e_<%=cid%>){
globalMap.put("<%=cid %>_CURRENT_STATUS", "File rename fail.");
throw e_<%=cid%>;
}
}
<%
}
%>
}
<%
@@ -292,12 +328,21 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e_<%=cid%>.getMessage());
final String destRename_<%= cid %> = map<%=cid %>.get(key<%=cid %>);
final String dest_<%=cid%>;
if (destRename_<%= cid %> == null || destRename_<%= cid %>.isEmpty()) {
<%
if (renameAfterUpload) {
%>
dest_<%=cid%> = listings<%=cid %>[m<%=cid %>].getName();
<%
} else {
%>
if (destRename_<%= cid %> == null || destRename_<%= cid %>.isEmpty()) {
dest_<%=cid%> = listings<%=cid %>[m<%=cid %>].getName();
} else {
dest_<%=cid%> = destRename_<%= cid %>;
}
<%
}
else {
dest_<%=cid%> = destRename_<%= cid %>;
}
%>
globalMap.put("<%=cid %>_CURRENT_FILE_EXISTS", remoteExistsFiles_<%=cid%>.contains(dest_<%=cid%>));
<%
@@ -360,6 +405,26 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e_<%=cid%>.getMessage());
+ file_in_localDir_<%=cid%>.length() + " bytes upload successfully");
<%
}
%>
<%
if (renameAfterUpload) {
%>
//do rename
if (destRename_<%= cid %> != null && !destRename_<%= cid %>.isEmpty() && ! destRename_<%= cid %>.equals(dest_<%=cid%>)) {
<%
if(!"never".equals(ftpsoverwrite)){
%>
if ((remoteExistsFiles_<%=cid%>.contains(destRename_<%=cid%>))){
ftpExecutorAndChecker_<%=cid %>.executeAndCheckResult(() -> effectivelyFinalFtp_<%=cid %>.deleteFile(destRename_<%= cid %>));
}
<%
}
%>
ftpExecutorAndChecker_<%=cid %>.executeAndCheckResult(() -> effectivelyFinalFtp_<%=cid %>.rename(dest_<%=cid%>, destRename_<%= cid %>));
globalMap.put("<%=cid %>_CURRENT_STATUS", "File rename OK.");
}
<%
}
%>
nb_file_<%=cid%>++;
}

View File

@@ -71,3 +71,4 @@ CONFIG_CLIENT.NAME=Config client
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=Client parameter
CLIENT_PARAMETERS.ITEM.VALUE=Value
RENAME_AFTER.NAME=Rename after upload/on remote

View File

@@ -71,3 +71,4 @@ CONFIG_CLIENT.NAME=Config client
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=Param\u00E8tre client
CLIENT_PARAMETERS.ITEM.VALUE=Valeur
RENAME_AFTER.NAME=Renommer apr\u00E8s chargement/\u00E0 distance

View File

@@ -71,3 +71,4 @@ CONFIG_CLIENT.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u8A2D\u5B9A
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
CLIENT_PARAMETERS.ITEM.VALUE=\u5024
RENAME_AFTER.NAME=\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u5F8C/\u30EA\u30E2\u30FC\u30C8\u3067\u540D\u524D\u3092\u5909\u66F4

View File

@@ -71,3 +71,4 @@ CONFIG_CLIENT.NAME=\u914D\u7F6E\u5BA2\u6237\u7AEF
CLIENT_PARAMETERS.NAME=
CLIENT_PARAMETERS.ITEM.PARAMETER=\u5BA2\u6237\u7AEF\u53C2\u6570
CLIENT_PARAMETERS.ITEM.VALUE=\u503C
RENAME_AFTER.NAME=\u4E0A\u4F20\u540E/\u8FDC\u7A0B\u65F6\u91CD\u547D\u540D

View File

@@ -433,7 +433,7 @@
<IMPORT NAME="httpclient-4.5.13" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')" />
<IMPORT NAME="httpcore-4.4.13" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')" />
<IMPORT NAME="httpmime-4.5.13" MODULE="httpmime-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpmime/4.5.13" REQUIRED_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')" />
<IMPORT NAME="COMMONS-Logging" MODULE="commons-logging-1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.jar" REQUIRED_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')" />
<IMPORT NAME="COMMONS-Logging" MODULE="commons-logging-1.1.jar" MVN="mvn:commons-logging/commons-logging/1.1" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.jar" REQUIRED_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')" />
<IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')" />
<IMPORT NAME="jcifs-samba" MODULE="jcifs-1.3.0.jar" MVN="mvn:org.talend.libraries/jcifs-1.3.0/6.0.0" REQUIRED_IF="(PROTO == 'SAMBA_PROTO')" />
</IMPORTS>

View File

@@ -244,11 +244,6 @@ org.apache.http.client.CredentialsProvider credsProvider_<%=cid %> = new org.apa
<%}%>
final org.apache.http.client.config.RequestConfig.Builder builder_<%=cid%> = org.apache.http.client.config.RequestConfig.custom();
builder_<%=cid%>.setConnectTimeout(<%=timeout %>);
<%if(isLog4jEnabled){%>
log.info("<%=cid%> - Connection to '" + <%=uri %> + "' has succeeded.");
<%
}
%>
org.apache.http.conn.util.PublicSuffixMatcher publicSuffixMatcher_<%=cid%> = org.apache.http.conn.util.PublicSuffixMatcherLoader.getDefault();
org.apache.http.config.Registry<org.apache.http.cookie.CookieSpecProvider> cookieSpecReg_<%=cid%> = org.apache.http.config.RegistryBuilder.<org.apache.http.cookie.CookieSpecProvider>create()
.register(org.apache.http.client.config.CookieSpecs.DEFAULT, new org.apache.http.impl.cookie.DefaultCookieSpecProvider(org.apache.http.impl.cookie.DefaultCookieSpecProvider.CompatibilityLevel.DEFAULT, publicSuffixMatcher_<%=cid%>, null, <%=singleCookie%>))
@@ -258,7 +253,7 @@ org.apache.http.client.CredentialsProvider credsProvider_<%=cid %> = new org.apa
final org.apache.http.client.protocol.HttpClientContext context_<%=cid%> = org.apache.http.client.protocol.HttpClientContext.create();
context_<%=cid%>.setCookieSpecRegistry(cookieSpecReg_<%=cid%>);
context_<%=cid%>.setCookieStore(cookieStore_<%=cid%>);
context_<%=cid%>.setRequestConfig(builder_<%=cid%>.build());
<%if (readCookie) {%>
List<org.apache.http.cookie.Cookie> cookieList_<%=cid%> = null;

View File

@@ -300,8 +300,8 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
}
}
sheetList_<%= cid %> = sheet_FilterNullList_<%= cid %>;
if(sheetList_<%= cid %>.size()>0){
int nb_line_<%= cid %> = 0;
if(sheetList_<%= cid %>.size()>0){
int begin_line_<%= cid %> = <%if(("").equals(header.trim())){%>0<%}else{%><%= header %><%}%>;
@@ -755,8 +755,8 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
}
}
sheetList_<%=cid%> = sheetList_FilterNull_<%=cid%>;
if(sheetList_<%= cid %>.size()>0){
int nb_line_<%= cid %> = 0;
if(sheetList_<%= cid %>.size()>0){
int begin_line_<%= cid %> = <%if(("").equals(header.trim())){%>0<%}else{%><%= header %><%}%>;

View File

@@ -40,11 +40,12 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e_<%=cid%>.getMessage());
<%}%>
<%log4jFileUtil.retrievedDataNumberInfo(node);%>
globalMap.put("<%=cid %>_NB_LINE",nb_line_<%=cid %>);
<%if((version07 && !eventMode) || !version07) {%>
}
<%}//Bug TDI-25655%>
} finally {
globalMap.put("<%=cid %>_NB_LINE",nb_line_<%=cid %>);
} finally {
<%if(!version07){%>
if(!(source_<%=cid %> instanceof java.io.InputStream)){
workbook_<%=cid %>.close();

View File

@@ -186,7 +186,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Java_Excel" MODULE="jxl.jar" MVN="mvn:org.talend.libraries/jxl/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.jexcel/lib/jxl.jar" REQUIRED_IF="(VERSION_2007 == 'false')" />
<IMPORT NAME="Java_Excel" MODULE="jxl-2.6.12.jar" MVN="mvn:net.sourceforge.jexcelapi/jxl/2.6.12" UrlPath="platform:/plugin/org.talend.libraries.jexcel/lib/jxl.jar" REQUIRED_IF="(VERSION_2007 == 'false')" />
<IMPORT NAME="simpleexcel" MODULE="simpleexcel-2.9-20230830.jar" MVN="mvn:org.talend.components/simpleexcel/2.9-20230830" UrlPath="platform:/plugin/org.talend.libraries.excel/lib/simpleexcel-2.9-20230830.jar" REQUIRED_IF="(VERSION_2007 == 'true') AND GENERATION_MODE == 'EVENT_MODE')" />
<IMPORT NAME="Java_DOM4J2" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3" REQUIRED_IF="(VERSION_2007 == 'true')" BundleID="" />
<IMPORT NAME="reload4j-1.2.22" MODULE="reload4j-1.2.22.jar" MVN="mvn:ch.qos.reload4j/reload4j/1.2.22" REQUIRED_IF="(VERSION_2007 == 'true')" BundleID="" />

View File

@@ -164,7 +164,7 @@
<CODEGENERATION>
<IMPORTS>
<!-- json path by javascript api -->
<IMPORT NAME="json_simple" MODULE="json_simple-1.1.jar" MVN="mvn:org.talend.libraries/json_simple-1.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.jackson/lib/json_simple-1.1.jar"
<IMPORT NAME="json_simple" MODULE="json-simple-1.1.jar" MVN="mvn:com.googlecode.json-simple/json-simple/1.1" UrlPath="platform:/plugin/org.talend.libraries.jackson/lib/json_simple-1.1.jar"
REQUIRED_IF="(READ_BY == 'JSONPATH_WITHOUTPUT_LOOP')" />
<IMPORT NAME="jsonpath" MODULE="jsonpath.jar" MVN="mvn:org.talend.libraries/jsonpath/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.jackson/lib/jsonpath.jar"
REQUIRED_IF="(READ_BY == 'JSONPATH_WITHOUTPUT_LOOP')" />
@@ -175,9 +175,9 @@
<IMPORT NAME="json-lib" MODULE="json-lib-2.4.8-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.8-talend" REQUIRED_IF="(READ_BY == 'XPATH')" />
<IMPORT NAME="commons_lang" 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="(READ_BY == 'XPATH')" />
<IMPORT NAME="commons_logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0" UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar"
<IMPORT NAME="commons_logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:commons-logging/commons-logging/1.1.1" UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar"
REQUIRED_IF="(READ_BY == 'XPATH')" BundleID="" />
<IMPORT NAME="ezmorph" MODULE="ezmorph-1.0.6.jar" MVN="mvn:org.talend.libraries/ezmorph-1.0.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.jackson/lib/ezmorph-1.0.6.jar"
<IMPORT NAME="ezmorph" MODULE="ezmorph-1.0.6.jar" MVN="mvn:net.sf.ezmorph/ezmorph/1.0.6" UrlPath="platform:/plugin/org.talend.libraries.jackson/lib/ezmorph-1.0.6.jar"
REQUIRED_IF="(READ_BY == 'XPATH')" />
<IMPORT NAME="xom" MODULE="xom-1.2.7.jar" MVN="mvn:org.talend.libraries/xom-1.2.7/6.0.0"
REQUIRED_IF="(READ_BY == 'XPATH')" />
@@ -185,13 +185,13 @@
REQUIRED_IF="(READ_BY == 'XPATH')" />
<IMPORT NAME="commons_collections" MODULE="commons-collections-3.2.2.jar" MVN="mvn:commons-collections/commons-collections/3.2.2" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-3.2.2.jar"
REQUIRED_IF="(READ_BY == 'XPATH')" />
<IMPORT NAME="staxon" MODULE="staxon-1.2.jar" MVN="mvn:org.talend.libraries/staxon-1.2/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.json/lib/staxon-1.2.jar"
<IMPORT NAME="staxon" MODULE="staxon-1.2.jar" MVN="mvn:de.odysseus.staxon/staxon/1.2" UrlPath="platform:/plugin/org.talend.libraries.json/lib/staxon-1.2.jar"
REQUIRED_IF="(READ_BY == 'XPATH')" />
<!-- json path -->
<IMPORT NAME="json-path-2.1.0.jar" MODULE="json-path-2.1.0.jar" MVN="mvn:org.talend.libraries/json-path-2.1.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.json/lib/json-path-2.1.0.jar"
<IMPORT NAME="json-path-2.1.0.jar" MODULE="json-path-2.1.0.jar" MVN="mvn:com.jayway.jsonpath/json-path/2.1.0" UrlPath="platform:/plugin/org.talend.libraries.json/lib/json-path-2.1.0.jar"
REQUIRED_IF="(READ_BY == 'JSONPATH') AND (JSON_PATH_VERSION == '2_1_0')" />
<IMPORT NAME="json-path-1.2.0.jar" MODULE="json-path-1.2.0.jar" MVN="mvn:org.talend.libraries/json-path-1.2.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.json/lib/json-path-1.2.0.jar"
<IMPORT NAME="json-path-1.2.0.jar" MODULE="json-path-1.2.0.jar" MVN="mvn:com.jayway.jsonpath/json-path/1.2.0" UrlPath="platform:/plugin/org.talend.libraries.json/lib/json-path-1.2.0.jar"
REQUIRED_IF="(READ_BY == 'JSONPATH') AND (JSON_PATH_VERSION == '1_2_0')" />
<IMPORT NAME="json-smart-2.4.11.jar" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11"
REQUIRED_IF="(READ_BY == 'JSONPATH')" />

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