Compare commits

...

145 Commits

Author SHA1 Message Date
Maksym Basiuk
48ca514c3f chore(TPS-2770): update plugin xml with breaks item 2018-11-05 11:24:11 +02:00
Maksym Basiuk
db11f2aa3b chore(TPS-2770): add migration task to enable strict date check 2018-11-02 14:18:25 +02:00
mbasiuk-talend
0b87bb8e52 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-02 11:46:23 +02:00
Maksym Basiuk
8944b2a295 Merge branch 'maintenance/7.0' of github.com:Talend/tdi-studio-se into maintenance/7.0 2018-11-02 11:45:44 +02:00
Chao MENG
73f62346f6 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-02 11:46:01 +08:00
jiezhang-tlnd
3effb055f0 fix(TUP-21005)In studio Java Debugging of Routes fails (#2869) (#2878) 2018-11-01 17:04:43 +08:00
hwang-talend
da97a1e4dd Hwang/tup 20837 master (#2859) (#2872)
* bugfix(TUP-20837):Job containing saleforce components takes too much
time to open
2018-11-01 15:55:30 +08:00
Jane Ding
adb196b3b9 fix(TUP-20778)Reference Project - New context group variable not (#2849) (#2854)
getting applied to the jobs
https://jira.talendforge.org/browse/TUP-20778
2018-10-31 10:54:47 +08:00
hwang-talend
b295304e1b bugfix(TUP-20693):Table selection widget - wrong generated code (#2818) (#2860)
bugfix(TUP-20693):Table selection widget - wrong generated code
2018-10-31 10:07:39 +08:00
apoltavtsev
46cbe162e1 TESB-23870 Camel dependencies are not included to manifest of route's child jobs (#2841) 2018-10-23 11:28:26 +02:00
wchen-talend
bb3299d509 fix(TUP-20799):Oracle Invalid Character with tSchemaComplianceCheck (#2809) 2018-10-17 15:50:49 +08:00
Dmytro Sylaiev
53ec637b08 fix(TDI-41043): SFTP tFTPFileList full file info fix (#2723) (#2768) 2018-10-17 10:45:58 +03:00
zwxue
ac8cc693df fix(TUP-20811): Migrate preference project version. (#2774) (#2805)
Conflicts:
	main/plugins/org.talend.designer.runprocess/src/main/java/org/talend/designer/runprocess/java/TalendJavaProjectManager.java
2018-10-17 11:50:48 +08:00
zwxue
006893a058 fix(TUP-20611):Retrieve correct CDH513 jar name and Maven uri for (#2614) (#2798)
missing jar dialog.
2018-10-16 11:35:26 +08:00
hwang-talend
97bcbae532 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
2018-10-15 15:48:53 +08:00
jiezhang-tlnd
09a13f0e0c bugfix(TUP-20711)Cannot "Guess schema" with tSQLDWHInput (#2780) (#2787) 2018-10-15 11:08:48 +08:00
wchen-talend
c14700d5c4 fix(TUP-20716):Could not find or load main class while running a big job (#2785) (#2789) 2018-10-15 10:59:59 +08:00
wchen-talend
a605cb57ff 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-15 10:54:41 +08:00
pyzhou
b867a700db fix(TDI-41115):tSalesforceWave throw exception if file exist (#2777) 2018-10-12 10:11:36 +08:00
mbasiuk-talend
52f3777266 fix(TDI-41119): add more condition to use edtftpj library (#2748) (#2763) 2018-10-10 10:35:32 +03:00
mbasiuk-talend
ffb61c3a0d fix(TDI-41119): add more condition to use edtftpj library (#2748) 2018-10-10 10:28:00 +03:00
zwxue
1e927de99e fix(TUP-20392):Error log shows after Migrating project from 6.5.1 to (#2686)
7.0.1
2018-10-01 13:55:47 +08:00
wang wei
d27fdf596a fix(TDI-40318): fix FTP permission issue for tFTPPut component sftp mode (#2199)
fix(TDI-40318): Talend FTP permission issue (#2298)
2018-09-27 15:08:44 +08:00
Nicolas Rousseau
338e2d6cd4 Revert "TESB-21702 Maven nature added to new child subjob (#2192)"
This reverts commit 34d92b92c9.
2018-09-27 12:33:10 +08:00
wang wei
eef4049e58 fix(TDI-40806): tS3Copy Component does not allow large file (like 8GB) copy from one bucket to another 2018-09-27 10:10:44 +08:00
chmyga
9678a561ee fix(TDI-40994): SnowflakeInput incorrect date (#2668)
* Fix Date conversion in IncomingSchemaEnforcer

* Fix tests

* Bump talend-codegen-utils lib version
2018-09-24 14:37:35 +03:00
qiongli
bd26f22a6f feat(TDQ-15611) Add tDataShuffling to this migration (#2696) 2018-09-20 17:45:43 +08:00
Chao MENG
4ade917962 feat(TUP-20678): Add APAC datacenter to the list on the studio (license (#2704)
/ connection)
https://jira.talendforge.org/browse/TUP-20678
2018-09-14 17:58:52 +08:00
msjian
a19f756e20 fix(TDQ-15391): for type "OSGI Bundle For ESB", when have tDqReportRun, (#2692)
must always export items.
2018-09-12 16:30:37 +08:00
kcoepeau
20f42ebbf4 fix(TBD-7678): Migrate tMatchModel (#2682) (#2683) 2018-09-11 11:13:33 +02:00
wchen-talend
f05d51fad1 fix(TUP-20570):Documentation for tXMLMap does not show the mapping (#2670) 2018-09-10 16:50:46 +08:00
jiezhang-tlnd
a085137913 fix(TUP-20634)Null pointer exception when trying to edit query by (#2660)
double-clicking query in Repository View
https://jira.talendforge.org/browse/TUP-20634
2018-09-10 14:42:02 +08:00
zhangjie
408b2439ac fix(TUP-20511)Need to limit the number of entry on the
custom_uri_mapping.json

Conflicts:
	main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/utils/JavaProcessUtil.java
2018-09-06 13:07:08 +08:00
msjian
00cac883a0 fix(TDQ-15391): when build job has tDqReportRun, must always (#2667)
exportitems.
2018-09-06 11:41:59 +08:00
kcoepeau
473e753722 fix(TBD-7596): Migrate to Timestamp format instead of Date (#2656) (#2657) 2018-09-05 14:59:42 +02:00
wchen-talend
4aec14cbfe fix(TUP-20570):Documentation for tXMLMap does not show the mapping (#2663) 2018-09-05 18:27:39 +08:00
Dmytro Sylaiev
cd31071434 fix(TDI-40927): Set default Authenticator for ftp socks proxy (#2648) 2018-09-04 13:05:00 +03:00
wchen-talend
f25e21f1fa Wchen/bugfix/tup 20570 xmlmap doc (#2639)
* fix(TUP-20570):cumentation for tXMLMap does not show the mapping

* fix(TUP-20570):Documentation for tXMLMap does not show the mapping
2018-09-03 16:52:58 +08:00
Dmytro Chmyga
10f6be032c fix(TDI-40868): incorrect dates inserted Snowflake
* Fix version of lib in plugin.xml
2018-09-03 08:47:16 +03:00
Stefan Le Moing
42ecd377f6 fix(TBD-7422): upgrade tDataPrepRun jar (#2579) 2018-08-31 08:57:04 +00:00
chmyga
354adead46 fix(TDI-40868): incorrect dates inserted Snowflake (#2605)
* fix(TDI-40868): incorrect dates inserted Snowflake

* Fix timezone problems for date fields

* Bump version

* fix(TDI-40868): incorrect dates inserted Snowflake

* Fix version of codegen lib in libraris custom
2018-08-30 08:26:57 +03:00
kcoepeau
1c5b98b8a2 fix(TBD-7495): Add checkbox to transform date type in timestamp (#2593) (#2631) 2018-08-24 16:48:53 +02:00
Stéphane Bouchet
4ba84b3716 fix(TESB-22547): call saveCustomMavenURIMap only once. (#2598) 2018-08-24 13:20:45 +08:00
Roman
85f8047e8a fix(TDI-40855): remove duplicated filter for datasource (#2591) 2018-08-23 10:11:56 +03:00
ypiel
ad45315ff8 feat(TDI-40900) : Update libs versions (#2626)
- bouncycastle/bcprov-jdk15on/1.6
- jackcess/2.1.12
- jackcess-encrypt/2.1.4
2018-08-22 10:48:45 +02:00
wang wei
f1d1876ed5 fix(TDI-40858): fix the tcompv0 dynamic type performance issue with studio(#2592)
# Conflicts:
#	main/plugins/org.talend.designer.components.libs/libs_src/talend-codegen-utils/pom.xml
#	main/plugins/org.talend.designer.core.generic/src/main/java/org/talend/designer/core/generic/model/Component.java
#	main/plugins/org.talend.libraries.custom/pom.xml

fix(TDI-40858): fix the unstable format as different OS(different row separator) and fix the format for the java file (#2599)
2018-08-20 10:25:02 +08:00
jzhao
56c61b6896 fix(TDI-40854): tGSConnection proxy workaround can't work from 7.0.1 (#2606) 2018-08-14 18:50:48 +08:00
wang wei
80de6d7443 fix(TDI-40757): Fix Job compilation error related to tJMSInput component (#2525)
fix(TDI-40757): fix the tjmsoutput (#2528)
2018-08-13 15:45:40 +08:00
wang wei
f55107f9f9 fix(TDI-40833): tSCPFileExists not working with wildcard (#2569) 2018-08-13 12:29:18 +08:00
pyzhou
cecdfd2ae3 fix(TDI-40825):Provide clear errorMessage for tServiceNow. (#2586) 2018-08-10 11:18:33 +08:00
pyzhou
2c16068c40 fix(TDI-40722):restore the origin logic of import xstream.jar (#2576)
Conflicts:
	main/plugins/org.talend.designer.components.localprovider/components/tBonitaInstantiateProcess/tBonitaInstantiateProcess_java.xml
2018-08-09 19:17:53 +08:00
Andreas Mattes
39952c69ff fix(TESB-22458): Ensure consistent recognition of ESB jobs.
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:33:17 +02:00
jiezhang-tlnd
2ea7088b71 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-08 19:37:20 +08:00
jzhao
1d9b5d7c47 fix(TDI-40824):tRedshiftOutputBulkExec compile error since generic
components name when use 'encrypt'(#2575)
2018-08-07 10:41:40 +08:00
Vladimir Bogatyrov
1339fbb0a1 [TESB-22901] cMap with user defined code routine failing in ESB runtime 2018-08-03 08:47:57 +03:00
pyzhou-talend
3fa670e8df fix(TDI-40722):remove xstream.jar for bonita component. 2018-08-03 09:18:36 +08:00
kjwang-talend
3d5355ef25 fix(TUP-20140)Checked status of items listed in Project Settings (#2504)
https://jira.talendforge.org/browse/TUP-20140
2018-08-02 18:33:19 +08:00
jzhao
cf4fd7aa45 fix(TDI-40271): [6.4.1] tMomInput is not retrieving USR properties and JMS headers from IBM MQSeries(#2218) 2018-07-31 17:16:56 +08:00
jzhao
8ee9bfe880 fix(TDI-40815): Compilation issue with tSalesforceOutput component with reject link(#2557)
* all tcomp v0 components with muilt reject should have same issue.
2018-07-31 16:56:14 +08:00
wchen-talend
c89c64f65f fix(TUP-20492):When doing extract as context for a tsalesforceinput, (#2544)
* fix(TUP-20492):When doing extract as context for a tsalesforceinput,
getting "UNEXPECTED_EXCEPTION" upon selecting the same connection
created.

* fix(TUP-20492):When doing extract as context for a tsalesforceinput,
getting "UNEXPECTED_EXCEPTION" upon selecting the same connection
created.
2018-07-27 18:33:28 +08:00
wang wei
a272585408 fix(TDI-40760): Error Connecting Aurora database using existing connection (#2523)
# Conflicts:
#	main/plugins/org.talend.designer.components.localprovider/components/templates/DB/Output/AbstractDBOutputFinally.javajet

fix(TDI-40760): add more condition to fix the stats and logs issue (#2531)
2018-07-24 11:41:18 +08:00
wchen-talend
74e62f4ad4 fix(TUP-20411):Adding context environment in the reference project, they (#2522)
do not get updated in the main project.
2018-07-23 14:47:04 +08:00
wang wei
589d905f5f fix(TDI-40688): tVerticaOutput in Copy mode: Nullable Float-values are rounded to the nearest integer(#2478) 2018-07-19 17:05:24 +08:00
Chao MENG
b5227467b8 fix(TUP-20391): Migration tasks are re-executed and encrypting passwords
https://jira.talendforge.org/browse/TUP-20391
2018-07-19 12:21:43 +08:00
hcyi
9523415e33 fix(TUP-20091):teltmssqlmap: show alias for columns from a middle table. (#2473)
* fix(TUP-20091):teltmssqlmap: show alias for columns from a middle table.

* fix(TUP-20091):teltmssqlmap: show alias for columns from a middle table.
2018-07-18 10:11:11 +08:00
Liu Xinquan
d7954573f1 fix(TDQ-15455): using getUniqueName().indexOf("tRecordMatching")>-1 insdead of getComponent().getName().equals("tRecordMatching") to judge the component is tRecordMatching or not (#2509) 2018-07-17 17:00:21 +08:00
nrousseau
c369aec02c fix(TUP-20438) fix export with war for tdm (#2506) 2018-07-16 15:24:59 +08:00
Jane Ding
0fc9402e80 fix(TUP-20385)Run job with using dynamic tRunJob throw compile error (#2498)
* fix(TUP-20385)Run job with using dynamic tRunJob throw compile error
https://jira.talendforge.org/browse/TUP-20385

* required would be ok
2018-07-13 10:14:20 +08:00
zafkirTalend
d7019c5b61 fix(TBD-7296): Fix duplicate variable 2018-07-11 13:47:18 +02:00
Chao MENG
139b5a4888 fix(TUP-20391): Migration tasks are re-executed and encrypting passwords (#2492)
fix(TUP-20391): Migration tasks are re-executed and encrypting passwords
https://jira.talendforge.org/browse/TUP-20391
2018-07-11 14:30:57 +08:00
SunChaoqun
8c63350cf0 TESB-22483:CI for ESB - Build Data Service using Jenkins will get an error (#2444) (#2496)
* TESB-22483:CI for ESB - Build Data Service using Jenkins will get an
error

* TESB-22483:CI for ESB - Build Data Service using Jenkins will get an
error
2018-07-11 12:01:30 +08:00
qiongli
65b9bbea19 fix(TDQ-15215): No need to run 'include-survivorship-rules' sice the (#2423)
rules in src/main/resources. they will be in jar/zip when build the
maven job
2018-07-10 15:58:08 +08:00
SunChaoqun
0df3180d8b TDQ-15215:standard job tRulesurvivorship can not run on TIC, zip file (#2486)
get by build job which not check "Items" also can not run
2018-07-10 15:57:39 +08:00
Dmytro Chmyga
a33bde1fb6 fix(TDI-40641): tTeradataFastLoad select DB Type
* Adjust versions for migration task
2018-07-09 07:57:04 +03:00
chmyga
dc61ef9463 fix(TDI-40641): tTeradataFastLoad select DB Type (#2440)
* fix(TDI-40641): tTeradataFastLoad select DB Type

* Add db type to tTeradataFastLoad

* Add Date,Timestamp and Time handling to tTeradataFastLoad

* Fix tTeradataFastLoadUtility

* fix(TDI-40641): tTeradataFastLoad select DB Type

* Add migration task
2018-07-09 07:51:46 +03:00
Andreas Mattes
5ac6149a07 fix(TESB-22458): Remove obsolete SAM feature setting code. (#2450)
Obsolete code for setting the SAM event feature is removed as it is causing compile errors.
2018-07-06 17:55:48 +08:00
zwxue
f82c2c22a0 fix(TUP-20326): backport other needed changes from master. 2018-07-06 10:40:29 +08:00
zwxue
792cfe4553 fix(TUP-20326):fix ref project routine install issue. 2018-07-06 10:40:04 +08:00
zwxue
eff2c90c34 fix(TUP-20217):Can't run a job including a tRunjob component. 2018-07-05 15:32:20 +08:00
zwxue
15e1556eb1 fix(TUP-20326):Error in job generation for job migrated form 6.5.1 2018-07-02 10:42:01 +08:00
wchen-talend
bc4a9bf619 fix(TUP-20261):Routine editor mixed the code 2018-06-29 18:53:12 +08:00
Chao MENG
f4671cf921 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-06-29 15:17:24 +08:00
Jane Ding
32058fae42 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
2018-06-29 10:49:23 +08:00
hcyi
b8c20fbf21 fix(TUP-20312):java.lang.StackOverflowError in 6.5.1 studio. (#2452) 2018-06-28 17:58:48 +08:00
jzhao
ab3923b5ee fix(TDI-40651): old framework salesforce oauth login type job can't be import to 7.0.1(#2445) 2018-06-27 09:09:51 +08:00
zwxue
e091a66234 fix(TUP-20230):Stop job running throw Unhandled event loop exception. (#2446) 2018-06-26 10:15:36 +08:00
kjwang-talend
48956dffed fix(TUP-20303)project folder name not correct in workspace after import (#2439)
using "Import an existing project"
https://jira.talendforge.org/browse/TUP-20303
2018-06-25 14:58:17 +08:00
Liu Xinquan
9930849c89 TDQ-15455 Compile error after refactoring job (#2430) 2018-06-21 15:25:15 +08:00
Jane Ding
9c1bbd25a8 fix(TUP-20231)Update Detection won't popup after updating it's joblet
(#2424)

* fix(TUP-20231)Update Detection won't popup after updating it's joblet
name in JobletView
https://jira.talendforge.org/browse/TUP-20231

* fix(TUP-20231)Update Detection won't popup after updating it's joblet
name in JobletView
if joblet related job is opened, should return.

Conflicts:
	main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/views/jobsettings/tabs/MainComposite.java
2018-06-20 17:07:25 +08:00
Chao MENG
495e5d4f8d fix(TUP-20053): Cannot run MapR 6.0 DI job with tSqoopImportAllTables (#2410)
fix(TUP-20053): Cannot run MapR 6.0 DI job with tSqoopImportAllTables
https://jira.talendforge.org/browse/TUP-20053
2018-06-19 15:24:19 +08:00
wang wei
33fd835df4 fix(TDI-40522): tAS400Output return wrong NB_line with BatchSize 2018-06-15 11:15:50 +08:00
wchen-talend
ac84e213e9 Wchen/bugfix/tup 20072 stats logs jdbc (#2411)
* fix(TUP-20072):Setting DB Type to JDBC causes a NullPointerException
when running the job in TOS 7.0.1

* fix(TUP-20072):Setting DB Type to JDBC causes a NullPointerException
when running the job in TOS 7.0.1
2018-06-15 10:12:06 +08:00
zafkirTalend
611118e42c feat(TBD-6950): Add location tBigQueryInput (#2408) 2018-06-13 10:50:46 +02:00
Jane Ding
204eacc507 Jding/bugfix/tup 19594 drag db problem (#2399)
* fix(TUP-19594)Drag DB metadata to job is different between new created
and import from 641
https://jira.talendforge.org/browse/TUP-19594
Add a migration task to set type name

* fix(TUP-19594)Drag DB metadata to job is different between new created
and import from 641
https://jira.talendforge.org/browse/TUP-19594
change the version

Conflicts:
	main/plugins/org.talend.repository/plugin.xml
2018-06-11 12:56:02 +08:00
Chao MENG
2a7caa71f8 fix(TUP-20156): Cannot open the tMap component, throwing 'An SWT error (#2398)
fix(TUP-20156): Cannot open the tMap component, throwing 'An SWT error has occured'.
https://jira.talendforge.org/browse/TUP-20156
2018-06-08 16:24:41 +08:00
wchen-talend
7952e2a44c fix(TUP-20021):Deactive component will change the execution order (#2390) 2018-06-08 11:30:35 +08:00
zwxue
9a0c2ec781 fix(TUP-20223):Wrong branch value in the jobs generated by CI. (#2394) 2018-06-08 11:00:36 +08:00
jzhao
8e4c318c85 fix(TDI-40441): remove duplicate item in cipher siute list for mom components(#2385) 2018-06-05 11:04:03 +08:00
achursin-talend
a6c35b4559 fix(TBD-6923): Fix using hive query name (#2380) 2018-06-04 15:26:45 +02:00
Andreas Mattes
c1d76aa27c fix(TESB-22183): Add support for circular WSDL imports to WSDLLoader. (#2377)
Circular WSDL imports are not prohibited by WS-I basic profile. However, they are currently causing WSDL import to fail in an endless recursion. The present fix corrects this condition and ensures that WSDL documents are not imported more than once.
2018-06-04 08:38:15 +02:00
kjwang-talend
3c99421cbd TUP-20199 Studio is way too slow when branching 2 ways with if condition (#2370)
https://jira.talendforge.org/browse/TUP-20199
2018-06-04 10:45:18 +08:00
Roman
124040ce20 fix(TDI-40448): creating of yaml file was fixed (#2314)
* fix(TDI-40448): creating of yaml file was fixed
2018-06-01 14:02:53 +03:00
ypiel
4bc08ca2fa fix(TDI-40521) : Encode to base64 byte[]->String (#2346) 2018-06-01 11:42:33 +02:00
wchen-talend
5713552d07 fix(TUP-20021):Deactive component will change the execution order (#2368) 2018-05-31 11:03:01 +08:00
hbhong
92eeb5acf1 TMDM-12082: Fixed throwing "java.lang.ClassCastException" while creating new version and open MDM Object from repository view (#2355) 2018-05-29 11:21:32 +08:00
Jane Ding
777c20d91e fix(TUP-19815)For can't find process (#2304) 2018-05-29 11:10:53 +08:00
Chao MENG
b0cc8fe5a9 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-05-28 17:54:15 +08:00
jzhao
20f2eb500f fix(TDI-40441): tMomXXX components to connect to SSL enabled Websphere MQ channel (#2341)
* add new parameters to support both ibm and oracle java cipher suite

* Upgrade the jars

* change "cipher spec" to "cipher suite"
2018-05-24 18:07:58 +08:00
Stéphane Bouchet
14eee45639 fix(TESB-21830) : deployment tab not shown when selecting service (#2258)
* 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-05-23 16:46:01 +02:00
Dmytro Sylaiev
a76bf3f436 fix(TDI-40513): Fix compile error for contated strings in FileName (#2329) 2018-05-23 10:39:58 +03:00
hcyi
4fc45b78f0 fix(TUP-20138):Importing projects with "Copy projects into workspace" (#2333)
unchecked copies the project to a temporary folder.
2018-05-23 14:24:06 +08:00
wchen-talend
a890df2575 fix(TUP-19943):Generated schema miss some fields while import xsd (#2290)
* fix(TUP-19943):Generated schema miss some fields while import xsd

* fix(TUP-19943): add some junit for the xsd import
2018-05-23 11:21:09 +08:00
wchen-talend
9a35f3f224 fix(TUP-20021):Deactive component will change the execution order (#2315) 2018-05-23 11:14:38 +08:00
Chao MENG
47598e3eff fix(TUP-20124): NPE during changing TCOMP component repository value (#2330)
fix(TUP-20124): NPE during changing TCOMP component repository value
https://jira.talendforge.org/browse/TUP-20124
2018-05-22 14:48:43 +08:00
Chao MENG
282aaa2216 fix(TUP-20133): Edit queries does not display the "SQL Builder" window (#2323)
fix(TUP-20133): Edit queries does not display the "SQL Builder" window in some conditions.
https://jira.talendforge.org/browse/TUP-20133
2018-05-21 10:22:12 +08:00
Anas KHABALI
761e0f08a6 fix(TDI-40473): fix date handling in tservicenowOutput (#2306) 2018-05-18 13:10:11 +01:00
zafkirTalend
dec5299013 fix(TBD-6701): Fix conflict (#2320) 2018-05-17 15:52:22 +02:00
zwxue
448b009031 fix(TUP-19754):mvn package fail when main project use subref project's (#2316)
job.
2018-05-17 11:13:47 +08:00
Andreas Mattes
a3070ed46d fix(TESB-22036): Add read access to list of bundles in FeaturesModel. (#2312)
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-15 16:11:32 +02:00
jzhao
337d613561 fix(TDI-40443): add check to control tsalesforceinput bulk mode all return null for empty value(#2302)
* set default value true when migration old framework jobs
2018-05-10 16:38:26 +08:00
zwxue
618f4cbd8d fix(TUP-20115):Use of SAP JCO Version greater than 3.0.10 in Talend (#2299)
7.0.1 causes initialization error.
2018-05-10 09:57:30 +08:00
Jane Ding
f663909477 fix(TUP-19815)Add a problem check for tRunJob (#2286)
* fix(TUP-19815)Add a problem check for tRunJob
https://jira.talendforge.org/browse/TUP-19815

* fix(TUP-19815)A better solution.

* fix(TUP-19815) A better description

* fix(TUP-19815)at first, when create a new tRunJob, this process is
empty,should not check
2018-05-08 14:37:50 +08:00
Mike Yan
02b2626cc9 TESB-22034: Fix handling of non-required bean libs in route builds (#2288) 2018-05-07 09:33:33 +02:00
Chao MENG
05f9a3af1c 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
2018-05-04 18:44:08 +08:00
Jane Ding
f79891a85a 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-04 16:38:13 +08:00
Chao MENG
1f5c43012e 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
2018-05-04 14:47:11 +08:00
zwxue
1b2115d4c8 fix(TUP-20065):Commandline can not logon a project with subref project (#2283)
after do initLocal.
2018-05-04 11:47:33 +08:00
Chao MENG
cdf522bc12 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
2018-05-03 15:30:56 +08:00
pyzhou
9075707f73 fix(TDI-40458):compile error dynamic schema with identity tsybaseOutput (#2274) 2018-05-03 09:25:43 +08:00
Anas KHABALI
f24277ac48 fix(TDI-40464): fix column mapping in servicenowInput component. (#2273)
with more than one result, tServicenownput returns bad data for resolved_at and closed_at fields
2018-05-02 10:47:29 +01:00
Chao MENG
67bc4f325b 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
2018-05-02 16:39:06 +08:00
Chao MENG
e46928e74a 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
2018-04-28 18:38:20 +08:00
Chao MENG
df419f053f 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
2018-04-28 18:36:55 +08:00
pyzhou
b8a21d4e53 fix(TDI-40451):remove the default module of tJMSXXX components. (#2263) 2018-04-27 15:27:11 +08:00
Mike Yan
680bfbe68b TESB-21804: Filter out camel-alldeps in MANIFEST for OSGi type export (#2257)
Merged as the master has been merged by @zwxue
2018-04-24 18:58:34 +08:00
kjwang-talend
05ee537604 fix(TUP-19974)Opening a job takes more than half an hour in studio (#2254)
https://jira.talendforge.org/browse/TUP-19974
2018-04-24 17:31:07 +08:00
kjwang-talend
2c009685c9 Kjwang/fix(tup 19974)opening a job takes more than half an hour in studio (#2232)
* fix(TUP-19974)Opening a job takes more than half an hour in studio
https://jira.talendforge.org/browse/TUP-19974

* fix(TUP-19974)Opening a job takes more than half an hour in studio
https://jira.talendforge.org/browse/TUP-19974
2018-04-24 15:42:27 +08:00
kjwang-talend
e5db894155 Kjwang/fix(tup 19732)joblet not being called after elt components (#2205)
* fix(TUP-19732)Joblet not being called after ELT components
https://jira.talendforge.org/browse/TUP-19732

* fix(TUP-19732)Joblet not being called after ELT components
https://jira.talendforge.org/browse/TUP-19732

* fix(TUP-19732)Joblet not being called after ELT components
https://jira.talendforge.org/browse/TUP-19732

* fix(TUP-19732)Joblet not being called after ELT components
https://jira.talendforge.org/browse/TUP-19732
2018-04-24 14:53:37 +08:00
Denis Sergent
45ae711c5a TESB-21832 Problems with job/route exec. with local runtime in Studio
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:43:26 +02:00
wang wei
65b4d89ba7 fix(TDI-40329): Constant String too long due to a large schema (#2188) 2018-04-18 10:37:13 +08:00
wchen-talend
2342aa075c fix(TUP-19931):Undo does not work after deleting link between (#2189)
tELTMSSqlInput and tELTMSSQLMap
2018-04-17 16:07:44 +08:00
kjwang-talend
fb56401c40 fix(TUP-4096)[tOracleInput] "Guess schema" uses wrong "Connection type" when using tOracleConnection (#2212)
* fix(TUP-4096)[tOracleInput] "Guess schema" uses wrong "Connection type"
when using tOracleConnection
https://jira.talendforge.org/browse/TUP-4096

* fix(TUP-4096)[tOracleInput] "Guess schema" uses wrong "Connection type"
when using tOracleConnection
https://jira.talendforge.org/browse/TUP-4096
2018-04-17 15:55:10 +08:00
Jenkins Continuous Build server
52647286a9 Set version to 7.0.2 SNAPSHOT 2018-04-17 08:37:01 +02:00
Chao MENG
fddc06b3a5 fix(TUP-20006): TaCoKit config version is stored in a wrong place (#2231)
fix(TUP-20006): TaCoKit config version is stored in a wrong place
https://jira.talendforge.org/browse/TUP-20006
2018-04-17 10:49:36 +08:00
Chao MENG
6ce2fb7abc 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
2018-04-17 10:48:24 +08:00
462 changed files with 6966 additions and 3368 deletions

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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier"
version="7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier"
version="7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier"
version="7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier">
version="7.0.2.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]
@@ -400,4 +400,12 @@
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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier"
version="7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier"
version="7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier"
version="7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier">
version="7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier"
version="7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier">
version="7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.qualifier
Bundle-Localization: plugin
Require-Bundle: org.talend.core.repository,
org.eclipse.emf.codegen,

View File

View File

@@ -66,25 +66,27 @@ if(hasInput){
if (writer_<%=cid%> instanceof org.talend.components.api.component.runtime.WriterWithFeedback) {
org.talend.components.api.component.runtime.WriterWithFeedback writerWithFeedbackMain_<%=cid%> = (org.talend.components.api.component.runtime.WriterWithFeedback) writer_<%=cid%>;
writerWithFeedbackMain_<%=cid%> = new org.talend.codegen.flowvariables.runtime.FlowVariablesWriter(writerWithFeedbackMain_<%=cid%>, container_<%=cid%>);
java.lang.Iterable<?> outgoingRecs = writerWithFeedbackMain_<%=cid%>.getSuccessfulWrites();
java.util.Iterator outgoingMainRecords_<%=cid%> = outgoingRecs.iterator();
java.lang.Iterable<?> outgoingRecs_<%=cid%> = writerWithFeedbackMain_<%=cid%>.getSuccessfulWrites();
java.util.Iterator outgoingMainRecords_<%=cid%> = outgoingRecs_<%=cid%>.iterator();
Object outgoingMain_<%=cid%> = null;
if (outgoingMainRecords_<%=cid%>.hasNext()) {
outgoingMainRecordsList_<%=cid%> = outgoingRecs;
outgoingMainRecordsList_<%=cid%> = outgoingRecs_<%=cid%>;
}
}
<%
}
if (rejectIrToRow != null) {
%>
java.lang.Iterable<?> outgoingRejectRecordsList_<%=cid%> = new java.util.ArrayList<Object>();
org.talend.components.api.component.runtime.WriterWithFeedback writerWithFeedbackReject_<%=cid%> = (org.talend.components.api.component.runtime.WriterWithFeedback) writer_<%=cid%>;
writerWithFeedbackReject_<%=cid%> = new org.talend.codegen.flowvariables.runtime.FlowVariablesWriter(writerWithFeedbackReject_<%=cid%>, container_<%=cid%>);
java.lang.Iterable<?> outgoingRejectRecs = writerWithFeedbackReject_<%=cid%>.getRejectedWrites();
java.util.Iterator outgoingRejectRecords_<%=cid%> = outgoingRejectRecs.iterator();
java.lang.Iterable<?> outgoingRejectRecordsList_<%=cid%> = new java.util.ArrayList<Object>();
if (writer_<%=cid%> instanceof org.talend.components.api.component.runtime.WriterWithFeedback) {
org.talend.components.api.component.runtime.WriterWithFeedback writerWithFeedbackReject_<%=cid%> = (org.talend.components.api.component.runtime.WriterWithFeedback) writer_<%=cid%>;
writerWithFeedbackReject_<%=cid%> = new org.talend.codegen.flowvariables.runtime.FlowVariablesWriter(writerWithFeedbackReject_<%=cid%>, container_<%=cid%>);
java.lang.Iterable<?> outgoingRejectRecs_<%=cid%> = writerWithFeedbackReject_<%=cid%>.getRejectedWrites();
java.util.Iterator outgoingRejectRecords_<%=cid%> = outgoingRejectRecs_<%=cid%>.iterator();
if (outgoingRejectRecords_<%=cid%>.hasNext()) {
outgoingRejectRecordsList_<%=cid%> = outgoingRejectRecs;
outgoingRejectRecordsList_<%=cid%> = outgoingRejectRecs_<%=cid%>;
}
}
<%
}
if(mainIrToRow != null) {

View File

@@ -11,6 +11,8 @@
private final Component component;
private int schemaIndex = 0;
public ProcessPropertiesGenerator(String cid, Component component) {
this.cid = cid;
this.component = component;
@@ -23,7 +25,9 @@
Object value = property.getStoredValue();
if (value != null) {
if (setDynamicTags && (value instanceof String) && isDynamicValue(String.valueOf(value), connName)) {
boolean isSchemaProperty = property instanceof org.talend.daikon.properties.property.SchemaProperty;
if (!isSchemaProperty && setDynamicTags && (value instanceof String) && isDynamicValue(String.valueOf(value), connName)) {
property.setTaggedValue(IGenericConstants.DYNAMIC_PROPERTY_VALUE, "true");
}
if (value instanceof List) { // if
@@ -77,10 +81,64 @@
props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
<%=property.getType().replaceAll("<.*>", "")%>.<%=property.getValue()%>);
<%
} else if (property instanceof org.talend.daikon.properties.property.SchemaProperty) {
} else if (isSchemaProperty) {
String schemaValue = component.getCodegenValue(property, property.getStringValue());
String[] splits = schemaValue.split("(?=\\\\\"name\\\\\":)");
String classNameTail = "fisrt";
if(!firstCall) {
classNameTail = "second";
}
%>
class SchemaSettingTool_<%=cid%>_<%=++schemaIndex%>_<%=classNameTail%> {
String getSchemaValue() {
<%
if((splits == null) || (splits.length < 2)) {
%>
return <%=schemaValue%>;
<%
} else {
%>
StringBuilder s = new StringBuilder();
<%
for(int i=0; i<splits.length; i++) {
String currentSplit = splits[i];
if(i == 0) {
%>
a(<%=currentSplit%>",s);
<%
continue;
}
if(i == (splits.length - 1)) {
%>
a("<%=currentSplit%>,s);
<%
continue;
}
%>
a("<%=currentSplit%>",s);
<%
}
%>
return s.toString();
<%
}
%>
}
void a(String part, StringBuilder strB) {
strB.append(part);
}
}
SchemaSettingTool_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%> sst_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%> = new SchemaSettingTool_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%>();
props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
new org.apache.avro.Schema.Parser().parse(<%=component.getCodegenValue(property, property.getStringValue())%>));
new org.apache.avro.Schema.Parser().parse(sst_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%>.getSchemaValue()));
<%
} else if (!(value instanceof String) || !((String)value).equals("")) {
%>

View File

@@ -137,8 +137,8 @@ for (INode node : process.getNodesOfType("tRESTClient")) {
}
}
boolean talendEsbJob = actAsProvider || actAsConsumer || !process.getNodesOfType("tRouteInput").isEmpty();
boolean talendEsbJobFactory = actAsProvider || !process.getNodesOfType("tRouteInput").isEmpty();
boolean talendEsbJob = talendEsbJobFactory || actAsConsumer;
boolean talendStepTemplate = !process.getNodesOfType("tActionInput").isEmpty() || !process.getNodesOfType("tActionOutput").isEmpty() || !process.getNodesOfType("tJobReject").isEmpty();
@@ -209,11 +209,6 @@ protected static void logIgnoredError(String message, Throwable cause) {
// fix for TESB-7714
talendESBJob.setEndpointRegistry(registry);
// TESB-15920 tRESTClient and SAM not working
<% if (hasSAM4RS) { %>
talendESBJob.setEventFeature(eventFeature);
<% } %>
return talendESBJob;
}
<% } %>

View File

@@ -97,7 +97,7 @@
}
// for tRecordMatching
if(conn.getTarget().getUniqueName().startsWith("tRecordMatching")){
if(conn.getTarget().getUniqueName().indexOf("tRecordMatching")>-1){
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.1</version>
<version>7.0.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.codegen</artifactId>

View File

@@ -147,7 +147,8 @@ public class JavaRoutineSynchronizer extends AbstractRoutineSynchronizer {
*/
private static void syncModule(Project project, File[] modules) throws SystemException {
IRunProcessService service = CodeGeneratorActivator.getDefault().getRunProcessService();
ITalendProcessJavaProject talenCodeJavaProject = service.getTalendCodeJavaProject(ERepositoryObjectType.ROUTINES, project);
ITalendProcessJavaProject talenCodeJavaProject = service.getTalendCodeJavaProject(ERepositoryObjectType.ROUTINES,
project.getTechnicalLabel());
if (talenCodeJavaProject == null) {
return;
}

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.1.qualifier
Bundle-Version: 7.0.2.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.1</version>
<version>7.0.2-SNAPSHOT</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.1.qualifier
Bundle-Version: 7.0.2.qualifier
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
Bundle-Vendor: .Talend SA.

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.4</version>
<version>0.20.7</version>
<packaging>jar</packaging>
<properties>
@@ -148,6 +148,7 @@
<version>${formatter.plugin.version}</version>
<configuration>
<configFile>talend_java_eclipse_formatter.xml</configFile>
<lineEnding>LF</lineEnding>
</configuration>
<dependencies>
<dependency>

View File

@@ -15,6 +15,12 @@ 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;
@@ -383,8 +389,10 @@ 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;
int avroDays = (int) (diDate.getTime() / ONE_DAY);
OffsetDateTime odt = LocalDateTime.ofInstant(diDate.toInstant(), ZoneId.systemDefault()).atOffset(ZoneOffset.UTC);
int avroDays = (int) ChronoUnit.DAYS.between(Instant.EPOCH, odt);
currentRecord.put(index, avroDays);
return;
}

View File

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

View File

@@ -15,10 +15,11 @@ package org.talend.codegen.enforcer;
import static org.talend.codegen.DiSchemaConstants.TALEND6_COLUMN_TALEND_TYPE;
import java.math.BigDecimal;
import java.util.Calendar;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
import org.apache.avro.LogicalType;
import org.apache.avro.LogicalTypes;
@@ -206,10 +207,10 @@ public class OutgoingSchemaEnforcer implements IndexedRecord {
LogicalType logicalType = nonnull.getLogicalType();
if (logicalType != null) {
if (logicalType == LogicalTypes.date()) {
Calendar c = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
c.setTimeInMillis(0L);
c.add(Calendar.DATE, (Integer) value);
return c.getTime();
// (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());
} else if (logicalType == LogicalTypes.timeMillis()) {
return value;
} else if (logicalType == LogicalTypes.timestampMillis()) {

View File

@@ -18,12 +18,14 @@ 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;
@@ -427,7 +429,7 @@ public class IncomingSchemaEnforcerTest {
}
@Test
public void testTypeConversion_toLogicalDate() {
public void testTypeConversion_toLogicalDate() throws ParseException {
// The expected schema after enforcement.
Schema designSchema = SchemaBuilder.builder().record("Record").fields() //
.name("field").type(AvroUtils._logicalDate()).noDefault() //
@@ -441,7 +443,12 @@ public class IncomingSchemaEnforcerTest {
assertThat(enforcer.getRuntimeSchema(), is(designSchema));
// Put values into the enforcer and get them as an IndexedRecord.
enforcer.put(0, new Date(1234567891011L));
// (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);
IndexedRecord adapted = enforcer.createIndexedRecord();
assertThat(adapted.get(0), is((Object) 14288));
assertThat(adapted.getSchema(), sameInstance(enforcer.getRuntimeSchema()));

View File

@@ -17,6 +17,8 @@ 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;
@@ -45,11 +47,15 @@ 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() {
public static void setup() throws ParseException {
runtimeSchema = SchemaBuilder.builder().record("Record").fields() //
.name("logicalTime").type(AvroUtils._logicalTime()).noDefault() //
.name("logicalDate").type(AvroUtils._logicalDate()).noDefault() //
@@ -77,6 +83,8 @@ 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");
}
/**
@@ -163,7 +171,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) new Date(1066608000000L))); // Mon Oct 20 03:00:00
assertThat(dynamicValues, hasEntry("logicalDate", (Object) testDate)); // Mon Oct 20 03:00:00
// EEST 2003 is
// 1066608000000 ms
assertThat(dynamicValues, hasEntry("logicalTimestamp", (Object) new Date(1489061653L)));
@@ -202,7 +210,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) new Date(1066608000000L)));
assertThat(dynamicValues, hasEntry("logicalDate", (Object) testDate));
assertThat(dynamicValues, hasEntry("logicalTimestamp", (Object) new Date(1489061653L)));
assertThat(dynamicValues, hasEntry("age", (Object) 100));
assertThat(dynamicValues, hasEntry("valid", (Object) true));
@@ -237,7 +245,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) new Date(1066608000000L)));
assertThat(dynamicValues, hasEntry("logicalDate", (Object) testDate));
assertThat(dynamicValues, hasEntry("logicalTimestamp", (Object) new Date(1489061653L)));
assertThat(dynamicValues, hasEntry("valid", (Object) true));
assertThat(dynamicValues, hasEntry("address", (Object) "Main Street"));

View File

@@ -5,6 +5,8 @@ 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;
@@ -45,7 +47,7 @@ public class OutgoingSchemaEnforcerTest {
/**
* 1000 days after 1970-01-01, equal to 1972-09-27.
*/
private static Date DATE_COMPARE = new Date(NUM_DAYS * 60 * 60 * 24 * 1000L);
private static Date DATE_COMPARE = Date.from(LocalDate.ofEpochDay(NUM_DAYS).atStartOfDay(ZoneId.systemDefault()).toInstant());
/**
* Creates runtime schema, design schema and record, which is used as test arguments

View File

@@ -10,7 +10,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>fluent-hc</artifactId>
<version>4.2.6</version>
<version>4.5.5</version>
</dependency>
<dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.1</version>
<version>7.0.2-SNAPSHOT</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