Compare commits

..

90 Commits

Author SHA1 Message Date
Dmytro Chmyga
cafcccca81 fix(TPS-3873): update release notes 2020-03-26 11:12:48 +02:00
Dmytro Chmyga
f8f8b32a67 fix(TPS-3873): add release notes 2020-03-25 15:47:05 +02:00
chmyga
32de750de8 fix(TDI-41469): tFileUnarchive zip64 format error (#3026) (#3066)
* fix(TDI-41469): tFileUnarchive zip64 format error

* Use apache commons compress in checkArchive lib

* fix(TDI-41469): tFileUnarchive zip64 format error

* Remove unused method
2020-03-25 15:17:50 +02:00
hzhao-talendbj
fccc0bee25 backport70(TUP-25951)Syncing of project and pom files doesnt happen (#4395)
* backport70(TUP-25951)Syncing of project and pom files doesnt happen
initally

* backport70(TUP-25951)Syncing of project and pom files doesnt happen
initally

* remove synchronized
2020-03-06 09:58:19 +08:00
Zhiwei Xue
085b138f84 Zwxue/7.0/tup 25833 (#4320)
* fix(TUP-23637):7.x missing local_project for big data spark batch job (#3671) (#3825)

* TESB-27139:"Could not find the context Default" is shown in runtime when
deploy a route into runtime
2020-01-14 11:58:12 +08:00
zshen-talend
dcf389451a fix(TPS-3611): backport a commit from TDQ-15215 on patch/7.0.1 to make (#4205)
sure rules file can be contain when publish.
2019-12-13 14:50:04 +08:00
Jane Ding
5b54b36993 fix(TUP-21596):exclude tLibraryLoad jars for independent subjob. (#3148) (#4076)
Conflicts:
	main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/utils/JavaProcessUtil.java
2019-10-29 14:52:57 +08:00
Jane Ding
fa8b4f0527 Jding/patch701 tps 3441 (#4069)
* fix(TUP-24540)java.lang.NoSuchMethodError: (#3978) (#3999)

org.slf4j.spi.LocationAwareLogger.log
https://jira.talendforge.org/browse/TUP-24540

Conflicts:
	main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/utils/JavaProcessUtil.java
	test/plugins/org.talend.designer.core.test/src/org/talend/designer/core/utils/JavaProcessUtilTest.java

Conflicts:
	main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/utils/JavaProcessUtil.java

* fix(TUP-24540)java.lang.NoSuchMethodError: (#4018) (#4021)

org.slf4j.spi.LocationAwareLogger.log
https://jira.talendforge.org/browse/TUP-24540

* fix(TUP-24540)java.lang.NoSuchMethodError: (#4055)

org.slf4j.spi.LocationAwareLogger.log
https://jira.talendforge.org/browse/TUP-24540

Conflicts:
	main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/utils/JavaProcessUtil.java
2019-10-28 16:13:50 +08:00
Mike Yan
2e73891eaf fix(TESB-27030): Exclude jms library when it is used from tRunJob 2019-10-15 15:23:23 +08:00
apoltavtsev
b3d4649f7c TESB-26951 Dependencies from SubJob are added to manifest of ParentJob 2019-10-14 17:40:36 +02:00
yanbasic
f7eeff285a fix(TESB-27030): Avoid to add activemq-all lib in OSGi bundle 2019-09-23 10:29:05 +08:00
apoltavtsev
f2d74d39e2 TESB-25164/TESB-26293 Intermittent "ClassNotFoundException: javax.mail.Address" errors (#3841)
* TESB-25164 Intermittent "ClassNotFoundException: javax.mail.Address" errors

* TESB-26293 Duplicated libraries in private & import packages of the build manifest file
2019-08-26 17:54:55 +08:00
Denis Sergent
077eb35d81 TESB-26772 Adds a way to externalise osgi-exclude.properties file (#3863)
This dev adds the opportunity to externalise osgi-exclude.properties
resource file from org.talend.repository bundle better than using the
one included in org.talend.repository budle jar file.
2019-08-23 11:43:49 +02:00
kjwang-talend
453514f91e fix(TUP-20027)Error opening job: Unhandled event loop exception (#2276)
(java.lang.StackOverflowError)
https://jira.talendforge.org/browse/TUP-20027
2019-07-19 13:58:58 +08:00
Jane Ding
58cfc176eb fix(TUP-22804)Job with component tSAPIDOCOutput not getting built (#3430) (#3433)
https://jira.talendforge.org/browse/TUP-22804
2019-07-01 12:36:51 +08:00
Hanna Liashchuk
cb47feb3a6 fix(TBD-8566): correct context var replacement in subqueries (#3420) (#3664) 2019-06-26 17:10:42 +03:00
Jane Ding
136dee79ee fix(TUP-22147)There is a NPE error when closing studio (#3443) (#3510)
* fix(TUP-22147)There is a NPE error when closing studio

* fix(TUP-22147)There is a NPE error when closing studio

Conflicts:
	main/plugins/org.talend.designer.runprocess/src/main/java/org/talend/designer/runprocess/java/TalendJavaProjectManager.java
2019-06-14 17:50:02 +08:00
jzhao
f5e0ba2a85 fix(TDI-42356):ClassCastException with dynamic schema and data source alias from table with column of type nvarchar(max) (#3504) (#3550)
* fix(TDI-42356):ClassCastException with dynamic schema and data source
alias from table with column of type nvarchar(max) (#3504)

* fix(TDI-42356):ClassCastException with dynamic schema and data source
alias from table with column of type nvarchar(max)

* TalendNTextImpl from talend lib to a patched jtds
* Add maven project to build patched jtds with TalendNTextImpl
* update talend lib talend_DB_mssqlUtil
* update depends on component side

* fix(TDI-42356):exclude jtds jar in osgi bundle

* fix(TDI-42356):fix missing changes for stats and logs with database
config

* fix(TDI-42356):change the GAV of build jar and maven path in
components

* fix(TDI-42356):change the version of jar

Conflicts:
	main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_java.xml

* fix(TDI-42356):ClassCastException with dynamic schema and data source
alias from table with column of type nvarchar(max) (#3504)

* exclude org.talend.designer.core from the patch

* fix(TDI-42356):set BundleID="" for patch
2019-06-14 11:09:09 +08:00
hwang-talend
30456071f4 Hwang/tup 22649 (#3413) (#3439)
bugfix(TUP-22649):tELTOracleMap : wrong Generated SQL Select query after
patch TPS-2944
2019-05-13 16:29:38 +08:00
hcyi
0e92a6e63d fix(TUP-22521):tHiveMap- Unexpected SQL syntax for 'case when (#3374)
...then....else' condition.
2019-04-22 10:51:05 +08:00
Jane Ding
b6e4feb75c Jding/tps 3005 nullpointer on build job (#3408)
* Jding/backport70/tup 21920 nullpointer on build job (#3305)

* fix(TUP-21920) Nullpointer on build job (#3266)

* fix(TUP-21920)Nullpointer on build job
https://jira.talendforge.org/browse/TUP-21920

Conflicts:
	main/plugins/org.talend.designer.core/src/main/java/messages.properties

* fix(TUP-21920)Nullpointer on build job (#3336) (#3370)

https://jira.talendforge.org/browse/TUP-21920
Loop dependency classpath issue caused main class not found
2019-04-16 14:30:38 +08:00
Zhiwei Xue
01b48554f1 fix(TUP-22619):Miss item files in final zip when publishing job in (#3389)
commandline
2019-04-15 15:16:24 +08:00
sponomarova
bdb5d74ec5 patch(TPS-2988): Duplicate variable Compile Error When Having several tELTHiveOutput (#3319) 2019-03-20 15:16:15 +02:00
apoltavtsev
516a30ea88 TESB-24730 Services no longer accessible ( NPE) after route deployment 2019-03-18 11:49:16 +03:00
kjwang-talend
8e9f2fe0ed kjwang/Fix-TUP-21903 tSalesForceConnection fix junit (#3314) (#3315)
https://jira.talendforge.org/browse/TUP-21903
2019-03-18 10:28:58 +08:00
Tao Tao
6135222d08 fix(TUP-21903):tSalesForceConnection JWT flow does not work with Context (#3254)
* fix(TUP-21903):tSalesForceConnection JWT flow does not work with Context
group variable set for connection type Oauth.
2019-03-18 10:26:42 +08:00
hcyi
9daf281c36 fix(TUP-21777):[7.0.1] Metadata Wizard with SSL cannot retrieve cluster. 2019-03-15 18:39:49 +08:00
Jane Ding
1b128697e9 fix(TUP-20333)When upgrading from Talend v5.6.1 to v6.4.1, the tmap has (#2459)
lost many mappings due to name change
https://jira.talendforge.org/browse/TUP-20333
2019-03-15 15:06:19 +08:00
hwang-talend
db7478d39e bugfix(TUP-21944):Problem with globalMap.get in tELTOracleOutput #3261
(#3302)

bugfix(TUP-21944):Problem with globalMap.get in tELTOracleOutput

Conflicts:
	main/plugins/org.talend.designer.dbmap/src/main/java/org/talend/designer/dbmap/language/generation/DbGenerationManager.java
2019-03-11 15:09:37 +08:00
hwang-talend
ef2b5c4585 bugfix(TUP-21944):Problem with globalMap.get in tELTOracleOutput (#3261)
* bugfix(TUP-21944):Problem with globalMap.get in tELTOracleOutput
component

Conflicts:
	main/plugins/org.talend.designer.dbmap/src/main/java/org/talend/designer/dbmap/language/generation/DbGenerationManager.java
	test/plugins/org.talend.designer.dbmap.test/src/org/talend/designer/dbmap/language/generation/DbGenerationManagerTest.java
2019-03-11 15:05:05 +08:00
hwang-talend
d1d339951b Hwang/tup 21868 (#3205)
* bugfix(TUP-20479):ELT Maps generate incorrect SQL

* bugfix(TUP-21164):Context is not recognized as context variable in ELT
#2984

Conflicts:
	main/plugins/org.talend.designer.dbmap/src/main/java/org/talend/designer/dbmap/language/generation/DbGenerationManager.java
	test/plugins/org.talend.designer.dbmap.test/src/org/talend/designer/dbmap/language/generation/DbGenerationManagerTest.java
2019-03-11 15:00:01 +08:00
wang wei
c10bfb7081 fix(TDI-40329): Constant String too long due to a large schema (#2188) 2019-02-28 17:36:53 +08:00
hcyi
9381e43254 fix(TUP-20312):java.lang.StackOverflowError in 6.5.1 studio. (#2452) 2019-02-25 15:00:36 +08:00
apoltavtsev
dfb2a2d9b0 TESB-22085 Dynamic schema column type is always String in Runtime 2019-02-11 11:54:18 +03:00
hwang
5dad832ea8 Hwang/tup 21164 (#3004) (#3011) (#3173)
* bugfix(TUP-21164):Context is not recognized as context variable in ELT
Map components and is not separated with string concat from SQL code

Conflicts:
	main/plugins/org.talend.designer.dbmap/src/main/java/org/talend/designer/dbmap/language/generation/DbGenerationManager.java
	test/plugins/org.talend.designer.dbmap.test/src/org/talend/designer/dbmap/language/generation/DbGenerationManagerTest.java
2019-01-31 20:47:08 +08:00
hwang-talend
9a18883b05 Hwang/tup 21164 (#3004) (#3011) (#3173)
* bugfix(TUP-21164):Context is not recognized as context variable in ELT
Map components and is not separated with string concat from SQL code

Conflicts:
	main/plugins/org.talend.designer.dbmap/src/main/java/org/talend/designer/dbmap/language/generation/DbGenerationManager.java
	test/plugins/org.talend.designer.dbmap.test/src/org/talend/designer/dbmap/language/generation/DbGenerationManagerTest.java
2019-01-31 17:33:20 +08:00
hwang-talend
f97759d303 # WARNING: head commit changed in the meantime
Hwang/tup 21164 (#3004) (#3011) (#3173)

* bugfix(TUP-21164):Context is not recognized as context variable in ELT
Map components and is not separated with string concat from SQL code

Conflicts:
	main/plugins/org.talend.designer.dbmap/src/main/java/org/talend/designer/dbmap/language/generation/DbGenerationManager.java
	test/plugins/org.talend.designer.dbmap.test/src/org/talend/designer/dbmap/language/generation/DbGenerationManagerTest.java
2019-01-31 17:18:46 +08:00
Chao MENG
a199ac5bca fix(TUP-19961): tELTMSSqlInput component does not support the schema (#2285)
with a DB-column name having Degree symbol in it
https://jira.talendforge.org/browse/TUP-19961
2019-01-31 17:06:06 +08:00
Chao MENG
3b925e8ccb fix(TUP-19961): tELTMSSqlInput component does not support the schema (#2284)
with a DB-column name having Degree symbol in it
https://jira.talendforge.org/browse/TUP-19961
2019-01-31 17:04:26 +08:00
Chao MENG
36111d561c fix(TUP-19961): tELTMSSqlInput component does not support the schema (#2277)
fix(TUP-19961): tELTMSSqlInput component does not support the schema with a DB-column name having Degree symbol in it
https://jira.talendforge.org/browse/TUP-19961
2019-01-31 17:01:59 +08:00
Chao MENG
6810d2efac fix(TUP-19961): tELTMSSqlInput component does not support the schema (#2266)
fix(TUP-19961): tELTMSSqlInput component does not support the schema with a DB-column name having Degree symbol in it
https://jira.talendforge.org/browse/TUP-19961
2019-01-31 16:49:31 +08:00
Chao MENG
9c5ace50db fix(TUP-19961): tELTMSSqlInput component does not support the schema with a DB-column name having Degree symbol in it (#2272)
* fix(TUP-19961): tELTMSSqlInput component does not support the schema
with a DB-column name having Degree symbol in it
https://jira.talendforge.org/browse/TUP-19961
2019-01-31 16:46:51 +08:00
Chao MENG
b4300999d3 fix(TUP-19961): tELTMSSqlInput component does not support the schema
with a DB-column name having Degree symbol in it

https://jira.talendforge.org/browse/TUP-19961
2019-01-31 16:44:56 +08:00
Chao MENG
9e56d4fb1b fix(TUP-19961): tELTMSSqlInput component does not support the schema (#2219)
fix(TUP-19961): tELTMSSqlInput component does not support the schema with a DB-column name having Degree symbol in it
https://jira.talendforge.org/browse/TUP-19961
2019-01-31 16:43:50 +08:00
zwxue
d7ab17a146 fix(TUP-20223):Wrong branch value in the jobs generated by CI. (#2394) 2018-12-24 11:48:46 +08:00
jzhao
f39c5c24e7 fix(TDI-41176):'File Json' > 'Input Json' metadata does not show parent values in Preview with JsonPath (#2820) (#2922) (#3093)
* add a new checkbox "Use the loop node as root" (tFileInputJson)

* fix tExtractJsonField

* fix wizard by set "Use the loop node as root" to false
2018-12-24 11:46:58 +08:00
Tao Tao
85e3ed0023 fix(TPS-2794):[7.0.1][20181221] (#3090)
"talend-bigdata-launcher-1.2.0-20170410.jar" not found when spark job
launched from standard job by jobserver (TBD-7933)
https://jira.talendforge.org/browse/TPS-2794
2018-12-20 14:37:36 +08:00
Chao MENG
f4a8133657 fix(TUP-21461): Routine libraries can't be updated to pom.xml of routine
in special case
https://jira.talendforge.org/browse/TUP-21461
2018-12-14 17:55:52 +08:00
Chao MENG
5fc7e4bf17 fix(TUP-20166): Studio "Attempted to beginRule: F/.Java/src/main/java, (#2348)
fix(TUP-20166): Studio "Attempted to beginRule: F/.Java/src/main/java, does not match outer scope rule" Error
https://jira.talendforge.org/browse/TUP-20166
2018-12-10 11:17:51 +08:00
hwang-talend
b0104a008f bugfix(TUP-21105):tDBConnection(Snowflake) issue within joblet. (#3028)
* bugfix(TUP-21105):tDBConnection(Snowflake) issue within joblet.

* bugfix(TUP-21105):tDBConnection(Snowflake) issue within joblet.
2018-12-04 14:43:59 +08:00
hwang-talend
13a67cfdd2 Hwang/tup 21105 t db connection (#2953) (#2994)
* bugfix(TUP-21105):tDBConnection(Snowflake) issue within joblet.
2018-12-04 14:43:42 +08:00
mbasiuk-talend
374f1e259d Mbasiuk/tdi 40846 date validation fix (#2620)
* fix(TDI-40846): improve date validation check

* fix(TDI-40846): correct formatting of code

* fix(TDI-40846): add check box use strict date check

* fix(TDI-40846): move to routines method
2018-11-19 15:45:13 +02:00
Chao MENG
036b3d8c45 fix(TUP-20319): Cloud Studio can't retrieve any project from TMC (#2448)
fix(TUP-20319): Cloud Studio can't retrieve any project from TMC
https://jira.talendforge.org/browse/TUP-20319
2018-11-13 17:39:33 +08:00
Chao MENG
dc685f91c1 fix(TUP-21039): "Apply context to children jobs" does not work for "grand son" job if Studio not restarted (#2848) (#2886)
* fix(TUP-21039): "Apply context to children jobs" does not work for
"grand son" job if Studio not restarted
2018-11-13 15:42:00 +08:00
Chao MENG
7afb7c4bf5 feat(TUP-20678): Add APAC datacenter to the list on the studio (license (#2704)
/ connection)
https://jira.talendforge.org/browse/TUP-20678
2018-11-13 15:40:18 +08:00
kjwang-talend
4450bd0bff fix(TUP-19974)Opening a job takes more than half an hour in studio (#2254)
https://jira.talendforge.org/browse/TUP-19974
2018-11-12 16:49:11 +08:00
hwang-talend
a8d46bec17 Hwang/tup 20837 master (#2859) (#2872)
* bugfix(TUP-20837):Job containing saleforce components takes too much
time to open

Conflicts:
	main/plugins/org.talend.repository.generic/src/main/java/org/talend/repository/generic/ui/dnd/GenericDragAndDropHandler.java
2018-11-12 15:48:17 +08:00
hwang
e5b73dff0e Revert "Revert "Kjwang/fix(tup 19974)opening a job takes more than half an hour in (#2844)""
This reverts commit 0f58b49a91.
2018-11-12 15:28:08 +08:00
jiezhang-tlnd
c306520690 fix(TUP-21005)In studio Java Debugging of Routes fails (#2869) 2018-11-05 10:53:45 +08:00
hwang
0f58b49a91 Revert "Kjwang/fix(tup 19974)opening a job takes more than half an hour in (#2844)"
This reverts commit c9c983ff66.
2018-11-01 14:53:07 +08:00
hwang-talend
c9c983ff66 Kjwang/fix(tup 19974)opening a job takes more than half an hour in (#2844)
fix(TUP-19974)Opening a job takes more than half an hour in studio
https://jira.talendforge.org/browse/TUP-19974
2018-11-01 14:18:23 +08:00
qiongli
9ffeacd193 fix(TPS-2771)Correct survivorship rules path (#2870) 2018-11-01 11:51:03 +08:00
wchen-talend
40a579f2d8 fix(TUP-20799):Oracle Invalid Character with tSchemaComplianceCheck (#2809) 2018-10-29 10:39:27 +08:00
wchen-talend
5304d090a5 Wchen/bugfix/7.0/tup 20799 validation rule (#2788)
* fix(TUP-20799):vaidation rule do not work for mssql and oracle (#2773)

* fix(TUP-20799):vaidation rule do not work for mssql and oracle (#2783)
2018-10-29 10:38:58 +08:00
apoltavtsev
480ff02083 TESB-23870 Camel dependencies are not included to manifest of route's
child jobs
2018-10-23 10:21:34 +08:00
hwang-talend
a40d8869fd bugfix(TUP-20739):tELTHiveMap generates wrong query when the operator is
(#2771)

* bugfix(TUP-20739):tELTHiveMap generates wrong query when the operator
is
used for any column in the source table

Conflicts:
	main/plugins/org.talend.designer.dbmap/src/main/java/org/talend/designer/dbmap/language/generation/DbGenerationManager.java
	test/plugins/org.talend.designer.dbmap.test/src/org/talend/designer/dbmap/language/generation/DbGenerationManagerTest.java
2018-10-22 13:47:07 +08:00
wchen-talend
cd90db66c2 fix(TPS-2707):[7.0.1]Routine editor mixed the code(TUP-20261) 2018-10-22 11:01:23 +08:00
Chao MENG
cb010e13de Revert "Revert "TPS-2726:[7.0.1] Studio takes long time to build the jobs(TUP-20751).""
This reverts commit 488af98793.
2018-10-17 16:28:04 +08:00
Chao MENG
488af98793 Revert "TPS-2726:[7.0.1] Studio takes long time to build the jobs(TUP-20751)."
This reverts commit bd5ac02ab1.
2018-10-17 16:20:38 +08:00
hcyi
bd5ac02ab1 TPS-2726:[7.0.1] Studio takes long time to build the jobs(TUP-20751). 2018-10-16 14:07:19 +08:00
Mike Yan
8b3d78a8ed fix(TESB-22547):Performance issues in studio with cConfig component 2018-09-12 14:42:43 +08:00
Stefan Le Moing
84f0c26c2c fix(TBD-7422): upgrade tDataPrepRun jar (#2651) 2018-08-31 15:05:07 +02:00
Laurent BOURGEOIS
1d2e5cb6c3 fix(TBD-6701): Fix conflict (#2320) (#2650) 2018-08-31 10:25:35 +02:00
jiezhang-tlnd
ba5d87d2a8 fix(TUP-20512)Metadata JDBC DB Connections Bug with context variables
(#2578)

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

Conflicts:
	main/plugins/org.talend.repository.generic/src/main/java/org/talend/repository/generic/util/GenericContextUtil.java
2018-08-27 11:02:43 +08:00
jzhao
7e7ff7ebeb fix(TDI-40815): Compilation issue with tSalesforceOutput component with reject link(#2557)
* all tcomp v0 components with muilt reject should have same issue.
2018-08-15 09:50:01 +08:00
Andreas Mattes
3b8bd49929 fix(TESB-22458): Remove obsolete SAM feature setting code.
Obsolete and no longer compileable code has been removed from the code generation template. Furthermore, the present fix makes sure that jobs embedded via component cTalendJob are consistently recognized as ESB jobs, and corresponding code fragment are added at code generation.
2018-08-09 12:41:10 +02:00
wchen-talend
117abe27d1 TPS-2624:[7.0.1] When doing extract as context for a tsalesforceinput,
getting "UNEXPECTED_EXCEPTION" upon selecting the same connection
created. (TUP-20492)
2018-08-06 11:03:17 +08:00
zwxue
cee7b6cae0 fix(TUP-20326): backport other needed changes from master. 2018-07-05 17:42:22 +08:00
zwxue
fa2123a1f1 fix(TUP-20326):fix ref project routine install issue. 2018-07-05 15:56:35 +08:00
zwxue
54a786b27c fix(TUP-20217):Can't run a job including a tRunjob component. 2018-07-05 15:43:12 +08:00
zwxue
9287f1d803 fix(TUP-19754):mvn package fail when main project use subref project's (#2316)
job.
2018-07-05 15:11:00 +08:00
zwxue
1c69ee668b fix(TUP-20065):Commandline can not logon a project with subref project (#2283)
after do initLocal.
2018-07-05 15:10:34 +08:00
zwxue
7c18b0a2bb fix(TUP-20326):Error in job generation for job migrated form 6.5.1 2018-07-04 09:43:31 +08:00
Jane Ding
2047c1e0c1 fix(TUP-19705)can't do mvn package for the build out job when select (#2246)
* fix(TUP-19705)can't do mvn package for the build out job when select
Sources(maven)
https://jira.talendforge.org/browse/TUP-19705
To support to use mvn package directly

* fix(TUP-19705)can't do mvn package for the build out job when select
Sources(maven)
Modified the wrong spell;
<talend.job.pompath>@ProjectRelativePath@</talend.job.pompath> the
@ProjectRelativePath@ can't change to ../  today,strange, so just
modified to ../

* fix(TUP-19705) This commit to fix that there is nothing in the build out
zip when user choose multiple job.

* fix(TUP-19705) added joblet, subjob and pigudf for zip

* fix(TUP-19705)package all joblet to zip, modified package subjob to
better solution.

* fix(TUP-19705)For packageSubJob and pom, better solution.

* fix(TUP-19705) arranged folder structure

* fix(TUP-19705) To support subjob which belongs to reference project
2018-05-29 10:11:21 +08:00
zwxue
f29b192dec fix(TUP-20115):Use of SAP JCO Version greater than 3.0.10 in Talend (#2299)
7.0.1 causes initialization error.
2018-05-29 10:04:20 +08:00
Andreas Mattes
fa8aa8d024 fix(TESB-22036): Add read access to list of bundles in FeaturesModel. (#2311)
Read access to the bundles included in a feature is required in order to determine which dependency modules are bundles and should therefore not be physically included in the route bundle.
2018-05-17 17:42:30 +08:00
Mike Yan
1376766caf TESB-22034: Fixed beans library can be set to optional 2018-04-28 15:37:57 +08:00
Mike Yan
0a2cd96f37 TESB-21804: Filter out camel-alldeps in MANIFEST for OSGi type export (#2255) 2018-04-24 18:54:17 +08:00
Stéphane Bouchet
3d1c3a1775 fix(TESB-21830) : deployment tab not shown when selecting service (#2250)
* fix(TESB-21830) : deployment tab not shown when selecting service

* fix(TESB-21830) : deployment tab not shown when selecting service

* fix(TESB-21830) : deployment tab not shown when selecting service

Added Exception handling
2018-04-24 11:27:15 +02:00
Denis Sergent
d0b54bbaab TESB-21832 Problems with job/route exec. with local runtime in Studio (#2251)
Local runtime for Studio job/routes execution should not be used in some
cases: build type has to be checked to define the best execution
processor. As execution processor must change when build type is updated
in deployment tab, processor can not be persisted anymore.
2018-04-23 17:52:06 +02:00
500 changed files with 3232 additions and 7278 deletions

View File

@@ -1,68 +1,70 @@
---
version: 7.0.1
module: https://talend.poolparty.biz/coretaxonomy/42
product:
- https://talend.poolparty.biz/coretaxonomy/23
---
# TPS-3404
| Info | Value |
| ---------------- | ---------------- |
| Patch Name | Patch\_20190920\_TPS-3404\_v1-7.0.1 |
| Release Date | 2019-10-11 |
| Target Version | 7.0.1.20190226\_1146-patch |
| Product affected | Talend Studio |
## Introduction
This is a self-contained patch.
**NOTE**: For information on how to obtain this patch, reach out to your Support contact at Talend.
## Fixed issues
This patch contains the following fixes:
- TPS-3404 [7.0.1] An error occurs on tFileOutputExcel after Iterate when /tmp/profiles folder does not exist (TDI-42092)
## Prerequisites
Consider the following requirements for your system:
- Talend Studio 7.0.1 must be installed.
- Patch TPS-2956 must be installed.
## Installation
### Installing the patch using Software update
1) Logon TAC and switch to Configuration->Software Update, then enter the correct values and save referring to the documentation: https://help.talend.com/reader/f7Em9WV_cPm2RRywucSN0Q/j9x5iXV~vyxMlUafnDejaQ
2) Switch to Software update page, where the new patch will be listed. The patch can be downloaded from here into the nexus repository.
3) On Studio Side: Logon Studio with remote mode, on the logon page the Update button is displayed: click this button to install the patch.
### Installing the patch using Talend Studio
1) Create a folder named "patches" under your studio installer directory and copy the patch .zip file to this folder.
2) Restart your studio: a window pops up, then click OK to install the patch, or restart the commandline and the patch will be installed automatically.
### Installing the patch using Commandline
Execute the following commands:
1. Talend-Studio-win-x86_64.exe -nosplash -application org.talend.commandline.CommandLine -consoleLog -data commandline-workspace startServer -p 8002 --talendDebug
2. initRemote {tac_url} -ul {TAC login username} -up {TAC login password}
3. checkAndUpdate -tu {TAC login username} -tup {TAC login password}
## Uninstallation
Backup the Affected files list below. Uninstall the patch by restore the backup files.
## Affected files for this patch
The following files are installed by this patch:
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_7.0.1.20190226\_1146-patch/components/tFileOutputExcel/tFileOutputExcel/_begin.javajet
---
version: 7.0.1
module: https://talend.poolparty.biz/coretaxonomy/42
product:
- https://talend.poolparty.biz/coretaxonomy/23
---
# TPS-3873
| Info | Value |
| ---------------- | ---------------- |
| Patch Name | Patch\_20200326_TPS-3873\_v1-7.0.1 |
| Release Date | 2020-03-26 |
| Target Version | 20180411\_1414-V7.0.1 |
| Product affected | Talend Studio |
## Introduction
This is a self-contained patch.
**NOTE**: For information on how to obtain this patch, reach out to your Support contact at Talend.
## Fixed issues
This patch contains the following fixes:
- TPS-3873 [7.0.1] tFileUnarchive : Option "Check the integrity before unzip" states file corrupted while zip file can be unzipped (TDI-41469)
## Prerequisites
Consider the following requirements for your system:
- Talend Studio 7.0.1 must be installed.
- Installed Patch_20190218_TPS-2919_v1-7.0.1 in advance
## Installation
### Installing the patch using Software update
1) Logon TAC and switch to Configuration->Software Update, then enter the correct values and save referring to the documentation: https://help.talend.com/reader/f7Em9WV_cPm2RRywucSN0Q/j9x5iXV~vyxMlUafnDejaQ
2) Switch to Software update page, where the new patch will be listed. The patch can be downloaded from here into the nexus repository.
3) On Studio Side: Logon Studio with remote mode, on the logon page the Update button is displayed: click this button to install the patch.
### Installing the patch using Talend Studio
1) Create a folder named "patches" under your studio installer directory and copy the patch .zip file to this folder.
2) Restart your studio: a window pops up, then click OK to install the patch, or restart the commandline and the patch will be installed automatically.
### Installing the patch using Commandline
Execute the following commands:
1. Talend-Studio-win-x86_64.exe -nosplash -application org.talend.commandline.CommandLine -consoleLog -data commandline-workspace startServer -p 8002 --talendDebug
2. initRemote {tac_url} -ul {TAC login username} -up {TAC login password}
3. checkAndUpdate -tu {TAC login username} -tup {TAC login password}
## Uninstallation
Backup the Affected files list below. Uninstall the patch by restore the backup files.
## Affected files for this patch
The following files are installed by this patch:
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_7.0.1.20190213\_1315-patch/components/tFileArchive/tFileArchive\_java.xml
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_7.0.1.20190213\_1315-patch/components/tFileUnarchive/tFileUnarchive\_java.xml
- {Talend\_Studio\_path}/plugins/org.talend.libraries.custom\_7.0.1.20180411\_1414/lib/checkArchive-1.1-20181130.jar

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.designer.abstractmap.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.designer.abstractmap

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.abstractmap.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.designer.alfrescooutput.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.designer.alfrescooutput

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.alfrescooutput.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.designer.business.diagram.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.designer.business.diagram
Bundle-Localization: plugin

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.business.diagram.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.talend.designer.codegen Nl Fragment
Bundle-SymbolicName: org.talend.designer.codegen.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.designer.codegen
Bundle-Localization: plugin
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.codegen.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.designer.components.exchange.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.designer.components.exchange

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.components.exchange.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Designer Plug-in Nl Fragment
Bundle-SymbolicName: org.talend.designer.core.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.designer.core
Bundle-Localization: plugin
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.core.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.designer.dbmap.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.designer.dbmap

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.dbmap.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.designer.documentation.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.designer.documentation

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.documentation.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.designer.fileoutputxml.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.designer.fileoutputxml

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.fileoutputxml.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.designer.gefabstractmap.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.designer.gefabstractmap

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.gefabstractmap.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Mapper component Plug-in Nl Fragment
Bundle-SymbolicName: org.talend.designer.mapper.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.designer.mapper
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.mapper.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Maven Job NL
Bundle-SymbolicName: org.talend.designer.maven.job.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.designer.maven.job
Bundle-RequiredExecutionEnvironment: JavaSE-1.7

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.maven.job.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Rowgenerator Nl Fragment
Bundle-SymbolicName: org.talend.designer.rowgenerator.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.designer.rowgenerator
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.rowgenerator.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.talend.designer.runprocess.nl fragment
Bundle-SymbolicName: org.talend.designer.runprocess.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.designer.runprocess
Bundle-Localization: plugin

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.runprocess.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.designer.scd.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.designer.scd

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.scd.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.designer.webservice.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.designer.webservice

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.webservice.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.designer.xmlmap.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.designer.xmlmap

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.xmlmap.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Expression Builder Nl Fragment
Bundle-SymbolicName: org.talend.expressionbuilder.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.expressionbuilder
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.expressionbuilder.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: NL
Bundle-SymbolicName: org.talend.presentation.onboarding.resource.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.presentation.onboarding.resource
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: NL
Bundle-SymbolicName: org.talend.presentation.onboarding.resource.tos.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.presentation.onboarding.resource.tos
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.repository.ftp.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.repository.ftp

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.ftp.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.repository.json.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.repository.json
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.json.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.repository.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.repository
Bundle-Localization: plugin
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.repository.view.di.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.repository.view.di

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.view.di.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.sbi.engines.client.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.sbi.engines.client

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.sbi.engines.client.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.spagic.engines.client.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Fragment-Host: org.talend.spagic.engines.client

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.spagic.engines.client.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.talend.sqlbuilder Nl Fragment
Bundle-SymbolicName: org.talend.sqlbuilder.nl
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.sqlbuilder
Bundle-Localization: plugin

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.sqlbuilder.nl</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.designer.business.feature"
label="Business Feature"
version="7.0.2.qualifier"
version="7.0.1.qualifier"
provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#business-feature">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.business.feature</artifactId>

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.rcp.branding.tos.feature"
label="Tos branding feature"
version="7.0.2.qualifier"
version="7.0.1.qualifier"
provider-name=".Talend SA."
plugin="org.talend.rcp.branding.tos">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.branding.tos.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.rcp.branding.tos.test.feature"
label="Test feature for TOS"
version="7.0.2.qualifier">
version="7.0.1.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]
@@ -400,12 +400,4 @@
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.datatools.xml.test"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
</feature>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.feature</artifactId>

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.sbi.feature</artifactId>

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.spagic.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.tos.components.feature"
label="Components-feature"
version="7.0.2.qualifier">
version="7.0.1.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.tos.components.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.tos.feature"
label="Tos feature"
version="7.0.2.qualifier"
version="7.0.1.qualifier"
provider-name=".Talend SA.">
<description url="http://www.example.com/description">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.tos.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.tos.libraries.feature"
label="Libraries_feature"
version="7.0.2.qualifier">
version="7.0.1.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.tos.libraries.feature</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Abstract Map Plug-in
Bundle-SymbolicName: org.talend.designer.abstractmap;singleton:=true
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Bundle-Activator: org.talend.designer.abstractmap.MapPlugin
Require-Bundle: org.eclipse.core.runtime,
org.talend.core,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.abstractmap</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Alfresco Output Component Plug-in
Bundle-SymbolicName: org.talend.designer.alfrescooutput;singleton:=true
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Bundle-Vendor: .Talend SA.
Require-Bundle: org.eclipse.core.runtime,
org.talend.core,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.alfrescooutput</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.talend.designer.business.diagram; singleton:=true
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.talend.designer.business.model.business.diagram.part.BusinessDiagramEditorPlugin
Bundle-Vendor: %providerName

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.business.diagram</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CodeGen Plug-in
Bundle-SymbolicName: org.talend.designer.codegen;singleton:=true
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Bundle-Localization: plugin
Require-Bundle: org.talend.core.repository,
org.eclipse.emf.codegen,

View File

@@ -526,107 +526,85 @@
}
}
<% for (IContextParameter ctxParam :params)
{
%>
context.setContextType("<%=ctxParam.getName()%>", "<%=ctxParam.getType()%>");
<%
if (ctxParam.getType().equals("id_Password")) {
%>
String pwd_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
context.<%=ctxParam.getName()%> = null;
if(pwd_<%=ctxParam.getName()%>_value!=null) {
if(context_param.containsKey("<%=ctxParam.getName()%>")) {//no need to decrypt if it come from program argument or parent job runtime
context.<%=ctxParam.getName()%> = pwd_<%=ctxParam.getName()%>_value;
} else if (!pwd_<%=ctxParam.getName()%>_value.isEmpty()) {
try {
context.<%=ctxParam.getName()%> = routines.system.PasswordEncryptUtil.decryptPassword(pwd_<%=ctxParam.getName()%>_value);
context.put("<%=ctxParam.getName()%>",context.<%=ctxParam.getName()%>);
} catch (java.lang.RuntimeException e) {
//do nothing
}
}
}
<%
final int maxContextInOneMethodToProcess = 100;
int lastMethodNumber = 0;
%>
class ContextProcessing {
private void processContext_0() {
<%
for (int i = 1; i <= params.size(); i++) {
IContextParameter ctxParam = params.get(i-1);
if (i % maxContextInOneMethodToProcess == 0) {
/* close previous method and declare new */
lastMethodNumber++;
%>
}
continue;
}
String typeToGenerate ="String";
if( !(ctxParam.getType().equals("id_File") || ctxParam.getType().equals("id_Directory") ||ctxParam.getType().equals("id_List Of Value")))
{
typeToGenerate=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true);
}
if(typeToGenerate.equals("java.util.Date"))
{
private void processContext_<%=lastMethodNumber%>() {
<%
} //endIf
%>
context.setContextType("<%=ctxParam.getName()%>", "<%=ctxParam.getType()%>");
<%
if (ctxParam.getType().equals("id_Password")) {
%>
String pwd_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
context.<%=ctxParam.getName()%> = null;
if(pwd_<%=ctxParam.getName()%>_value!=null) {
if(context_param.containsKey("<%=ctxParam.getName()%>")) {//no need to decrypt if it come from program argument or parent job runtime
context.<%=ctxParam.getName()%> = pwd_<%=ctxParam.getName()%>_value;
} else if (!pwd_<%=ctxParam.getName()%>_value.isEmpty()) {
try {
context.<%=ctxParam.getName()%> = routines.system.PasswordEncryptUtil.decryptPassword(pwd_<%=ctxParam.getName()%>_value);
context.put("<%=ctxParam.getName()%>",context.<%=ctxParam.getName()%>);
} catch (java.lang.RuntimeException e) {
//do nothing
}
}
}
<%
continue;
}
String typeToGenerate ="String";
if( !(ctxParam.getType().equals("id_File") || ctxParam.getType().equals("id_Directory") ||ctxParam.getType().equals("id_List Of Value"))) {
typeToGenerate=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true);
}
if(typeToGenerate.equals("java.util.Date")) {
%>
try{
String context_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
if (context_<%=ctxParam.getName()%>_value == null){
context_<%=ctxParam.getName()%>_value = "";
}
int context_<%=ctxParam.getName()%>_pos = context_<%=ctxParam.getName()%>_value.indexOf(";");
String context_<%=ctxParam.getName()%>_pattern = "yyyy-MM-dd HH:mm:ss";
if(context_<%=ctxParam.getName()%>_pos > -1){
context_<%=ctxParam.getName()%>_pattern = context_<%=ctxParam.getName()%>_value.substring(0, context_<%=ctxParam.getName()%>_pos);
context_<%=ctxParam.getName()%>_value = context_<%=ctxParam.getName()%>_value.substring(context_<%=ctxParam.getName()%>_pos + 1);
}
%>
try{
String context_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
if (context_<%=ctxParam.getName()%>_value == null){
context_<%=ctxParam.getName()%>_value = "";
}
int context_<%=ctxParam.getName()%>_pos = context_<%=ctxParam.getName()%>_value.indexOf(";");
String context_<%=ctxParam.getName()%>_pattern = "yyyy-MM-dd HH:mm:ss";
if(context_<%=ctxParam.getName()%>_pos > -1){
context_<%=ctxParam.getName()%>_pattern = context_<%=ctxParam.getName()%>_value.substring(0, context_<%=ctxParam.getName()%>_pos);
context_<%=ctxParam.getName()%>_value = context_<%=ctxParam.getName()%>_value.substring(context_<%=ctxParam.getName()%>_pos + 1);
}
context.<%=ctxParam.getName()%>=(java.util.Date)(new java.text.SimpleDateFormat(context_<%=ctxParam.getName()%>_pattern).parse(context_<%=ctxParam.getName()%>_value));
context.<%=ctxParam.getName()%>=(java.util.Date)(new java.text.SimpleDateFormat(context_<%=ctxParam.getName()%>_pattern).parse(context_<%=ctxParam.getName()%>_value));
} catch(ParseException e) {
context.<%=ctxParam.getName()%>=null;
}
<%
} else if(typeToGenerate.equals("Object")||typeToGenerate.equals("String")||typeToGenerate.equals("java.lang.String")) {
%>
context.<%=ctxParam.getName()%>=(<%=typeToGenerate%>) context.getProperty("<%=ctxParam.getName()%>");
<%
} else if(typeToGenerate.equals("Character")&&ctxParam.getName()!=null) {
%>
context.<%=ctxParam.getName()%>= new java.text.StringCharacterIterator(context.getProperty("<%=ctxParam.getName()%>")).first();
<%
} else {
%>
try{
context.<%=ctxParam.getName()%>=routines.system.ParserUtils.parseTo_<%=typeToGenerate%> (context.getProperty("<%=ctxParam.getName()%>"));
} catch(NumberFormatException e){
context.<%=ctxParam.getName()%>=null;
}
<%
}
}
%>
} <%/*close last method*/%>
public void processAllContext() {
<%
for (int i = 0; i <=lastMethodNumber; i++) {
%>
processContext_<%=i %>();
<%
}
%>
}catch(ParseException e)
{
context.<%=ctxParam.getName()%>=null;
}
<%
}else if(typeToGenerate.equals("Object")||typeToGenerate.equals("String")||typeToGenerate.equals("java.lang.String") )
{
%>
context.<%=ctxParam.getName()%>=(<%=typeToGenerate%>) context.getProperty("<%=ctxParam.getName()%>");
<%
}else if(typeToGenerate.equals("Character")&&ctxParam.getName()!=null)
{
%>
context.<%=ctxParam.getName()%>= new java.text.StringCharacterIterator(context.getProperty("<%=ctxParam.getName()%>")).first();
<%
} else {
%>
try{
context.<%=ctxParam.getName()%>=routines.system.ParserUtils.parseTo_<%=typeToGenerate%> (context.getProperty("<%=ctxParam.getName()%>"));
}catch(NumberFormatException e){
context.<%=ctxParam.getName()%>=null;
}
<%
}
}
new ContextProcessing().processAllContext();
%>
} catch (java.io.IOException ie) {
System.err.println("Could not load context "+contextStr);
ie.printStackTrace();
}
// get context value from parent directly
if (parentContextMap != null && !parentContextMap.isEmpty()) {
<% for (IContextParameter ctxParam :params){

View File

@@ -516,8 +516,6 @@ private class TalendException extends Exception {
if(!(e instanceof TDieException)){
<%
boolean needCatchTalendException = false;
if (process.getNodesOfType("tLogCatcher").size() > 0) {
List<INode> logCatchers = (List<INode>)process.getNodesOfType("tLogCatcher");
for (INode logCatcher : logCatchers) {
@@ -549,7 +547,6 @@ private class TalendException extends Exception {
if (ElementParameterParser.getValue(logCatcher, "__CATCH_JAVA_EXCEPTION__").equals("true")) {
if(logCatcher!=virtualNCatchNode){
// 2) launch logCatcher subProcess
needCatchTalendException = true;
%>
<%=logCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
<%
@@ -562,7 +559,6 @@ private class TalendException extends Exception {
<%
}
if(virtualNCatchNode!=null){
needCatchTalendException = true;
%>
<%=virtualNCatchNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
<%
@@ -576,12 +572,31 @@ private class TalendException extends Exception {
%>
}
<%
boolean needCatchTalendException = false;
if (process.getNodesOfType("tLogCatcher").size() > 0) {
for(INode node:process.getNodesOfType("tLogCatcher")){
if(ElementParameterParser.getValue(node, "__CATCH_JAVA_EXCEPTION__").equals("true")){
needCatchTalendException = true;
break;
}
}
}
if ((!needCatchTalendException) && (process.getNodesOfType("tAssertCatcher").size() > 0)) {
for(INode node:process.getNodesOfType("tAssertCatcher")){
if(ElementParameterParser.getValue(node, "__CATCH_JAVA_EXCEPTION__").equals("true")){
needCatchTalendException = true;
break;
}
}
}
if(needCatchTalendException) {
//TODO should catch the TalendException in assertcatcher process? but before should not work too as use java reflect, this exception can't catch
%>
} catch (TalendException e) {
// do nothing
<%
if (process.getNodesOfType("tLogCatcher").size() > 0) {
%>
} catch (TalendException e) {
// do nothing
<%
}
}
%>
} catch (Exception e) {

View File

@@ -97,7 +97,7 @@
}
// for tRecordMatching
if(conn.getTarget().getUniqueName().indexOf("tRecordMatching")>-1){
if(conn.getTarget().getUniqueName().startsWith("tRecordMatching")){
List<Map<String, String>> joinKeys = (List<Map<String,String>>)ElementParameterParser.getObjectValue(conn.getTarget(), "__BLOCKING_DEFINITION__");
for(Map<String, String> joinKeyLine : joinKeys){
String lookupKey = joinKeyLine.get("LOOKUP_COLUMN");

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.codegen</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Exchange Plug-in
Bundle-SymbolicName: org.talend.designer.components.exchange;singleton:=true
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Bundle-Activator: org.talend.designer.components.exchange.ExchangePlugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.components.exchange</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Components Libs Plug-in
Bundle-SymbolicName: org.talend.designer.components.libs
Bundle-Version: 7.0.2.qualifier
Bundle-Version: 7.0.1.qualifier
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
Bundle-Vendor: .Talend SA.

View File

@@ -1,50 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.libraries</groupId>
<artifactId>commons-net-ftps-proxy</artifactId>
<version>3.6.1-talend-20190128</version>
<name>commons-net-talend</name>
<dependencies>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.6</version>
</dependency>
</dependencies>
<properties>
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
</properties>
<distributionManagement>
<snapshotRepository>
<id>talend_nexus_deployment</id>
<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
<snapshots><enabled>true</enabled></snapshots>
<releases><enabled>false</enabled></releases>
</snapshotRepository>
<repository>
<id>talend_nexus_deployment</id>
<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
<snapshots><enabled>false</enabled></snapshots>
<releases><enabled>true</enabled></releases>
</repository>
</distributionManagement>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

View File

@@ -1,309 +0,0 @@
package org.talend.ftp;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.Inet6Address;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSocket;
import org.apache.commons.net.ftp.FTPCmd;
import org.apache.commons.net.ftp.FTPReply;
import org.apache.commons.net.util.Base64;
public class HTTPProxyFTPSClient extends SSLSessionReuseFTPSClient {
/** Default PROT Command */
private static final String DEFAULT_PROT = "C";
private final String proxyHost;
private final int proxyPort;
private final String proxyUsername;
private final String proxyPassword;
private SSLContext context;
private String protectionLevel;
private String tunnelHost; // Save the host when setting up a tunnel (needed for EPSV)
private static final byte[] CRLF = { '\r', '\n' };
private final Base64 base64 = new Base64();
public HTTPProxyFTPSClient(boolean isImplicit, SSLContext context, String proxyHost, int proxyPort, String proxyUser,
String proxyPass) {
super(isImplicit, context);
this.proxyHost = proxyHost;
this.proxyPort = proxyPort;
this.proxyUsername = proxyUser;
this.proxyPassword = proxyPass;
this.tunnelHost = null;
this.context = context;
this.protectionLevel = DEFAULT_PROT;
}
/**
* Call execPROT from Parent class and stores current protection level
*
* @see org.apache.commons.net.ftp.FTPSClient#execPROT(String)
*/
@Override
public void execPROT(String prot) throws SSLException, IOException {
super.execPROT(prot);
this.protectionLevel = prot;
}
/**
* @see org.apache.commons.net.SocketClient#connect(java.lang.String, int)
*/
@Override
public void connect(String host, int port) throws IOException {
_socket_ = new Socket(proxyHost, proxyPort);
_input_ = _socket_.getInputStream();
_output_ = _socket_.getOutputStream();
try {
tunnelHandshake(host, port, _input_, _output_);
} catch (Exception e) {
throw new IOException("Could not connect to " + host + " using port " + port, e);
}
super._connectAction_();
}
/**
* Open ssl socket (if private protection level selected) using tunnel socket
*
* @see org.apache.commons.net.ftp.FTPSClient#_openDataConnection_(java.lang.String, java.lang.String)
*/
@Override
protected Socket _openDataConnection_(String command, String arg) throws IOException {
//Force local passive mode, active mode not supported by through proxy
if (getDataConnectionMode() != PASSIVE_LOCAL_DATA_CONNECTION_MODE) {
throw new IllegalStateException("Only passive connection mode supported using proxy");
}
final boolean isInet6Address = getRemoteAddress() instanceof Inet6Address;
String passiveHost;
// Try EPSV command first on IPv6 - and IPv4 if enabled.
// When using IPv4 with NAT it has the advantage
// to work with more rare configurations.
// E.g. if FTP server has a static PASV address (external network)
// and the client is coming from another internal network.
// In that case the data connection after PASV command would fail,
// while EPSV would make the client succeed by taking just the port.
boolean attemptEPSV = isUseEPSVwithIPv4() || isInet6Address;
if (attemptEPSV && epsv() == FTPReply.ENTERING_EPSV_MODE) {
_parseExtendedPassiveModeReply(_replyLines.get(0));
passiveHost = this.tunnelHost;
} else {
if (isInet6Address) {
return null; // Must use EPSV for IPV6
}
// If EPSV failed on IPV4, revert to PASV
if (pasv() != FTPReply.ENTERING_PASSIVE_MODE) {
return null;
}
_parsePassiveModeReply(_replyLines.get(0));
passiveHost = this.getPassiveHost();
}
return DEFAULT_PROT.equals(protectionLevel) ?
openPlainDataConnection(passiveHost, command, arg) : openEncryptedDataConnection(passiveHost, command, arg);
}
/**
* Create, configure and open SSLSocket via plain tunnel Socket
* @param passiveHost host returned from ftp server after sending PASV command
* @param command to execute
* @param arg for command
* @return SSLSocket using to Data transmit
* @throws IOException
*/
private Socket openEncryptedDataConnection(String passiveHost, String command, String arg) throws IOException {
Socket proxySocket = createTunnelSocket();
proxySocket.connect(new InetSocketAddress(proxyHost, proxyPort), getConnectTimeout());
tunnelHandshake(passiveHost, this.getPassivePort(), proxySocket.getInputStream(),
proxySocket.getOutputStream());
Socket socket = context.getSocketFactory().createSocket(proxySocket, passiveHost, this.getPassivePort(), true);
_prepareDataSocket_(socket);
configureDataSocket(socket);
if (isRestartOffsetIncorrect()) {
proxySocket.close();
socket.close();
return null;
}
if (!FTPReply.isPositivePreliminary(sendCommand(command, arg))) {
proxySocket.close();
socket.close();
return null;
}
if (socket instanceof SSLSocket) {
SSLSocket sslSocket = (SSLSocket) socket;
configureSSLDataSocket(sslSocket);
sslSocket.startHandshake();
}
return socket;
}
private Socket createTunnelSocket() throws IOException {
Socket proxySocket = new Socket();
configureDataSocket(proxySocket);
return proxySocket;
}
private void configureSSLDataSocket(SSLSocket sslSocket) {
sslSocket.setUseClientMode(getUseClientMode());
sslSocket.setEnableSessionCreation(getEnableSessionCreation());
// server mode
if (!getUseClientMode()) {
sslSocket.setNeedClientAuth(getNeedClientAuth());
sslSocket.setWantClientAuth(getWantClientAuth());
}
if (getEnabledCipherSuites() != null) {
sslSocket.setEnabledCipherSuites(getEnabledCipherSuites());
}
if (getEnabledProtocols() != null) {
sslSocket.setEnabledProtocols(getEnabledProtocols());
}
}
private void configureDataSocket(Socket socket) throws IOException {
if (getReceiveDataSocketBufferSize() > 0) {
socket.setReceiveBufferSize(getReceiveDataSocketBufferSize());
}
if (getSendDataSocketBufferSize() > 0) {
socket.setSendBufferSize(getSendDataSocketBufferSize());
}
if (getPassiveLocalIPAddress() != null) {
socket.bind(new InetSocketAddress(getPassiveLocalIPAddress(), 0));
}
}
/**
* @see org.apache.commons.net.ftp.FTPHTTPClient#_openDataConnection_(FTPCmd, String)
* @return Plain Socket using HTTP proxy
*/
private Socket openPlainDataConnection(String passiveHost, String command, String arg) throws IOException {
Socket socket = preparePlainDataTunnelSocket(passiveHost);
if (isRestartOffsetIncorrect()) {
socket.close();
return null;
}
if (!FTPReply.isPositivePreliminary(sendCommand(command, arg))) {
socket.close();
return null;
}
return socket;
}
/**
* Create, prepare and connect plain data transmit socket via tunnel proxy
*/
private Socket preparePlainDataTunnelSocket(String passiveHost) throws IOException {
Socket socket = _socketFactory_.createSocket(proxyHost, proxyPort);
InputStream is = socket.getInputStream();
OutputStream os = socket.getOutputStream();
tunnelHandshake(passiveHost, this.getPassivePort(), is, os);
return socket;
}
/**
* HTTP handshake for proxy
*/
private void tunnelHandshake(String host, int port, InputStream input, OutputStream output) throws IOException {
final String connectString = "CONNECT " + host + ":" + port + " HTTP/1.1";
final String hostString = "Host: " + host + ":" + port;
this.tunnelHost = host;
output.write(connectString.getBytes(StandardCharsets.UTF_8));
output.write(CRLF);
output.write(hostString.getBytes(StandardCharsets.UTF_8));
output.write(CRLF);
if (proxyUsername != null && proxyPassword != null) {
final String auth = proxyUsername + ":" + proxyPassword;
final String header =
"Proxy-Authorization: Basic " + base64.encodeToString(auth.getBytes(StandardCharsets.UTF_8));
output.write(header.getBytes(StandardCharsets.UTF_8));
}
output.write(CRLF);
output.flush();
List<String> response = new ArrayList<>();
BufferedReader reader = new BufferedReader(new InputStreamReader(input, getCharset()));
String responseLine;
while ((responseLine = reader.readLine()) != null && responseLine.length() > 0) {
response.add(responseLine);
}
int size = response.size();
if (size == 0) {
throw new IOException("No response from proxy");
}
String code;
String resp = response.get(0);
if (resp.startsWith("HTTP/") && resp.length() >= 12) {
code = resp.substring(9, 12);
} else {
throw new IOException("Invalid response from proxy: " + resp);
}
if (!"200".equals(code)) {
StringBuilder msg = new StringBuilder();
msg.append("HTTPTunnelConnector: connection failed\r\n");
msg.append("Response received from the proxy:\r\n");
for (String line : response) {
msg.append(line);
msg.append("\r\n");
}
throw new IOException(msg.toString());
}
}
private boolean isRestartOffsetIncorrect() throws IOException {
return (getRestartOffset() > 0) && !restart(getRestartOffset());
}
}

View File

@@ -1,43 +0,0 @@
package org.talend.ftp;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.net.Socket;
import java.util.Locale;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSessionContext;
import javax.net.ssl.SSLSocket;
import org.apache.commons.net.ftp.FTPSClient;
public class SSLSessionReuseFTPSClient extends FTPSClient {
public SSLSessionReuseFTPSClient(boolean isImplicit, SSLContext context) {
super(isImplicit, context);
}
@Override
protected void _prepareDataSocket_(final Socket socket) {
if (socket instanceof SSLSocket) {
final SSLSession session = ((SSLSocket) _socket_).getSession();
final SSLSessionContext context = session.getSessionContext();
try {
final Field sessionHostPortCache = context.getClass().getDeclaredField("sessionHostPortCache");
sessionHostPortCache.setAccessible(true);
final Object cache = sessionHostPortCache.get(context);
final Method putMethod = cache.getClass().getDeclaredMethod("put", Object.class, Object.class);
putMethod.setAccessible(true);
final Method getHostMethod = socket.getClass().getDeclaredMethod("getHost");
getHostMethod.setAccessible(true);
Object host = getHostMethod.invoke(socket);
final String key =
String.format("%s:%s", host, String.valueOf(socket.getPort())).toLowerCase(Locale.ROOT);
putMethod.invoke(cache, key, session);
} catch (Exception e) {
e.printStackTrace();
}
}
}
}

View File

@@ -7,7 +7,7 @@
<groupId>org.talend.libraries</groupId>
<artifactId>talend-codegen-utils</artifactId>
<!-- release for revert version of library -->
<version>0.20.7</version>
<version>0.20.4</version>
<packaging>jar</packaging>
<properties>
@@ -148,7 +148,6 @@
<version>${formatter.plugin.version}</version>
<configuration>
<configFile>talend_java_eclipse_formatter.xml</configFile>
<lineEnding>LF</lineEnding>
</configuration>
<dependencies>
<dependency>

View File

@@ -15,12 +15,6 @@ package org.talend.codegen.enforcer;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -389,10 +383,8 @@ public class IncomingSchemaEnforcer {
if (LogicalTypeUtils.isLogicalDate(fieldSchema)) {
// (igonchar): diValue MUST be of java.util.Date
// (dchmyga): we need to count days according to OUR date, and not timestamp in UTC.
Date diDate = (Date) diValue;
OffsetDateTime odt = LocalDateTime.ofInstant(diDate.toInstant(), ZoneId.systemDefault()).atOffset(ZoneOffset.UTC);
int avroDays = (int) ChronoUnit.DAYS.between(Instant.EPOCH, odt);
int avroDays = (int) (diDate.getTime() / ONE_DAY);
currentRecord.put(index, avroDays);
return;
}

View File

@@ -129,8 +129,6 @@ public class OutgoingDynamicSchemaEnforcer extends OutgoingSchemaEnforcer {
this.runtimeFields = runtimeSchema.getFields();
this.dynamicFieldsIndexes = ((DynamicIndexMapper) indexMapper).computeDynamicFieldsIndexes(runtimeSchema);
createDynamicFieldsSchema();
firstRecordProcessed = true;
}
}

View File

@@ -15,11 +15,10 @@ package org.talend.codegen.enforcer;
import static org.talend.codegen.DiSchemaConstants.TALEND6_COLUMN_TALEND_TYPE;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
import org.apache.avro.LogicalType;
import org.apache.avro.LogicalTypes;
@@ -207,10 +206,10 @@ public class OutgoingSchemaEnforcer implements IndexedRecord {
LogicalType logicalType = nonnull.getLogicalType();
if (logicalType != null) {
if (logicalType == LogicalTypes.date()) {
// (dchmyga): we need to set date as number of days at the end of the day in current timezone
LocalDate ld = LocalDate.ofEpochDay(((Integer) value).longValue());
ZonedDateTime zonedDate = ld.atStartOfDay(ZoneId.systemDefault());
return Date.from(zonedDate.toInstant());
Calendar c = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
c.setTimeInMillis(0L);
c.add(Calendar.DATE, (Integer) value);
return c.getTime();
} else if (logicalType == LogicalTypes.timeMillis()) {
return value;
} else if (logicalType == LogicalTypes.timestampMillis()) {

View File

@@ -18,14 +18,12 @@ import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.sameInstance;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.avro.Schema;
@@ -429,7 +427,7 @@ public class IncomingSchemaEnforcerTest {
}
@Test
public void testTypeConversion_toLogicalDate() throws ParseException {
public void testTypeConversion_toLogicalDate() {
// The expected schema after enforcement.
Schema designSchema = SchemaBuilder.builder().record("Record").fields() //
.name("field").type(AvroUtils._logicalDate()).noDefault() //
@@ -443,12 +441,7 @@ public class IncomingSchemaEnforcerTest {
assertThat(enforcer.getRuntimeSchema(), is(designSchema));
// Put values into the enforcer and get them as an IndexedRecord.
// (dchmyga): test is incorrect. We need to test the conversion with a Date value,
// which will mean the same date in any time zone
// enforcer.put(0, new Date(1234567891011L));
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
Date testDate = dateFormat.parse("2009-02-13");
enforcer.put(0, testDate);
enforcer.put(0, new Date(1234567891011L));
IndexedRecord adapted = enforcer.createIndexedRecord();
assertThat(adapted.get(0), is((Object) 14288));
assertThat(adapted.getSchema(), sameInstance(enforcer.getRuntimeSchema()));

View File

@@ -17,8 +17,6 @@ import static org.hamcrest.Matchers.hasEntry;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;
@@ -47,15 +45,11 @@ public class OutgoingDynamicSchemaEnforcerTest {
*/
private static IndexedRecord record;
private static Date testDate;
/**
* Creates runtime schema and record, which are used in all tests
*
* @throws ParseException
*/
@BeforeClass
public static void setup() throws ParseException {
public static void setup() {
runtimeSchema = SchemaBuilder.builder().record("Record").fields() //
.name("logicalTime").type(AvroUtils._logicalTime()).noDefault() //
.name("logicalDate").type(AvroUtils._logicalDate()).noDefault() //
@@ -83,8 +77,6 @@ public class OutgoingDynamicSchemaEnforcerTest {
record.put(7, "Main Street");
record.put(8, "This is a record with nine columns.");
record.put(9, new Date(1467170137872L));
testDate = new SimpleDateFormat("yyyy-MM-dd").parse("2003-10-20");
}
/**
@@ -171,7 +163,7 @@ public class OutgoingDynamicSchemaEnforcerTest {
Map<String, Object> dynamicValues = (Map<String, Object>) enforcer.get(0);
assertThat(dynamicValues.size(), equalTo(7));
assertThat(dynamicValues, hasEntry("logicalTime", (Object) 11111));
assertThat(dynamicValues, hasEntry("logicalDate", (Object) testDate)); // Mon Oct 20 03:00:00
assertThat(dynamicValues, hasEntry("logicalDate", (Object) new Date(1066608000000L))); // Mon Oct 20 03:00:00
// EEST 2003 is
// 1066608000000 ms
assertThat(dynamicValues, hasEntry("logicalTimestamp", (Object) new Date(1489061653L)));
@@ -210,7 +202,7 @@ public class OutgoingDynamicSchemaEnforcerTest {
Map<String, Object> dynamicValues = (Map<String, Object>) enforcer.get(2);
assertThat(dynamicValues.size(), equalTo(7));
assertThat(dynamicValues, hasEntry("logicalTime", (Object) 11111));
assertThat(dynamicValues, hasEntry("logicalDate", (Object) testDate));
assertThat(dynamicValues, hasEntry("logicalDate", (Object) new Date(1066608000000L)));
assertThat(dynamicValues, hasEntry("logicalTimestamp", (Object) new Date(1489061653L)));
assertThat(dynamicValues, hasEntry("age", (Object) 100));
assertThat(dynamicValues, hasEntry("valid", (Object) true));
@@ -245,7 +237,7 @@ public class OutgoingDynamicSchemaEnforcerTest {
Map<String, Object> dynamicValues = (Map<String, Object>) enforcer.get(3);
assertThat(dynamicValues.size(), equalTo(7));
assertThat(dynamicValues, hasEntry("logicalTime", (Object) 11111));
assertThat(dynamicValues, hasEntry("logicalDate", (Object) testDate));
assertThat(dynamicValues, hasEntry("logicalDate", (Object) new Date(1066608000000L)));
assertThat(dynamicValues, hasEntry("logicalTimestamp", (Object) new Date(1489061653L)));
assertThat(dynamicValues, hasEntry("valid", (Object) true));
assertThat(dynamicValues, hasEntry("address", (Object) "Main Street"));

View File

@@ -5,8 +5,6 @@ import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertThat;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.Date;
import org.apache.avro.Schema;
@@ -47,7 +45,7 @@ public class OutgoingSchemaEnforcerTest {
/**
* 1000 days after 1970-01-01, equal to 1972-09-27.
*/
private static Date DATE_COMPARE = Date.from(LocalDate.ofEpochDay(NUM_DAYS).atStartOfDay(ZoneId.systemDefault()).toInstant());
private static Date DATE_COMPARE = new Date(NUM_DAYS * 60 * 60 * 24 * 1000L);
/**
* Creates runtime schema, design schema and record, which is used as test arguments

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.2-SNAPSHOT</version>
<version>7.0.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.components.libs</artifactId>

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