Compare commits

...

268 Commits

Author SHA1 Message Date
Jenkins Continuous Build server
b95e274a93 Set version to 7.1.1 M2 2018-07-24 13:51:59 +02:00
Jan Lolling
0ef59e68c5 TDI-39567 improve performance in log4j code (#1655) 2018-07-24 03:48:58 -04:00
Chao MENG
7f1c6ee113 fix(TUP-20425): Cannot load BD node after logging on DI project (#2533)
https://jira.talendforge.org/browse/TUP-20425
2018-07-23 18:26:52 +08:00
wchen-talend
7db0205875 fix(TUP-20411):Adding context environment in the reference project, they (#2522)
do not get updated in the main project.
2018-07-23 11:12:25 +08:00
Anas KHABALI
c0bfff61a1 TCOMP-918 : use component-studio pom to handle some dependencies versions (#2532) 2018-07-23 10:34:55 +08:00
Stéphane Bouchet
5533ee28a3 fix(TESB-22628): fixed NPE during test execution (#2474) 2018-07-20 16:19:57 +02:00
mtuhai
500ea4fea3 Fix/tbd 7269 winutils problem (#2520)
* TBD-7269: fix

* mvn uri fix

* review fix
2018-07-20 16:39:26 +03:00
wang wei
a2a900aee0 fix(TDI-40760): add more condition to fix the stats and logs issue (#2531) 2018-07-20 19:02:32 +08:00
Anas KHABALI
af4edb0c87 fix(TUP-20463) add tacokit lib repository to job run scripts (#2529) 2018-07-20 18:38:01 +08:00
chmyga
73c59037b7 fix(TCOMP-921): boolean fields in tables (#2530)
* Convert Object to boolean for CheckElementParameter on update
2018-07-20 13:02:22 +03:00
wang wei
f77caa66ce fix(TDI-40757): fix the tjmsoutput (#2528) 2018-07-20 14:50:23 +08:00
Ivan Gonchar
04e121945e chore: bump tacokit version to 1.0.3 (#2527) 2018-07-20 10:22:24 +08:00
dlin-talend
03b09e3d8c TUP-20332:Change new branding images for 7.1 (#2514) 2018-07-20 09:01:43 +08:00
Stéphane Bouchet
4e005e49c5 Remove unnecessary com.sun import (#2526) 2018-07-19 15:07:39 +02:00
sbliu
bd86f1b11f TMDM-11319 MDM components should not displayed using DI license. (#2521)
Move mdm components and mdm trigger resource and  related config from localprovider to mdm plugin.
2018-07-19 18:21:49 +08:00
pyzhou
89871f6a68 fix(TDI-40722):Upgrade xstream.jar to avoid CVE-2017-7957 issue (#2524)
* fix(TDI-40722):Upgrade xstream.jar to avoid CVE-2017-7957 issue

* fix(TDI-40722):correct the mvn path
2018-07-19 17:13:26 +08:00
kjwang-talend
3baa4484ab TUP-20448 exception show in error log when i export a job contain (#2516)
connection then import it again
https://jira.talendforge.org/browse/TUP-20448
2018-07-19 16:57:05 +08:00
wang wei
7d7604eb12 fix(TDI-40757): Fix Job compilation error related to tJMSInput component (#2525) 2018-07-19 16:39:47 +08:00
wang wei
cedc43214c fix(TDI-40760): Error Connecting Aurora database using existing connection (#2523) 2018-07-19 15:19:19 +08:00
Chao MENG
5a7791793a fix(TUP-20391): Migration tasks are re-executed and encrypting passwords (#2519)
fix(TUP-20391): Migration tasks are re-executed and encrypting passwords
https://jira.talendforge.org/browse/TUP-20391
2018-07-19 12:54:31 +08:00
pyzhou
125a814459 fix(TDI-40467):New icon for tDB components. (#2518) 2018-07-18 14:03:02 +08:00
jzhao
fe673b3c8b Revert "fix(TDI-36144):SCD deactivates for type 2 records even if an inserting record is rejected(#2425)" (#2517)
This reverts commit 10826518c8.
2018-07-18 10:17:53 +08:00
Liu Xinquan
58b3804599 fix(TDQ-15455): using getUniqueName().indexOf("tRecordMatching")>-1 insdead of getComponent().getName().equals("tRecordMatching") to judge the component is tRecordMatching or not (#2508) 2018-07-17 17:00:18 +08:00
Anas KHABALI
9d5f09d60e TUP-20427 : integrate maxBatchSize from component model (#2507)
Fix guess schema (force maxbatchSize to 1) and handle null values
Fix multischema connector creation
2018-07-17 09:51:16 +02:00
Dmytro Sylaiev
bf00598cc6 fix(TDI-32435): VerticaBulkExec codegen error (#2493)
* fix(TDI-32435): VerticaBulkExec codegen error

* Avoid ArrayIndexOfBoundsException when schema is empty

* fix(TDI-32435): Add null-check

* fix(TDI-32435): Init string with null instead of empty String

* fix(TDI-32435): Throw runtime exception if schema is empty

* Use StringBuilder to build result String
2018-07-17 10:32:28 +03:00
Oleh Stoliarov
19717502f7 Fix Qubole cluster label for Hive components (#2513)
Previously set the cluster label is not taken into consideration, part of modifications is done in qubole spark batch commit 4597627b2b
2018-07-16 16:59:12 +02:00
Laurent BOURGEOIS
55e3c41186 fix(TBD7343): fix variable name (#2512) 2018-07-16 12:13:51 +02:00
kjwang-talend
67c8cfa00f kjwang/feat(TUP-20080)Create migration task for all modificatios of (#2465)
kjwang/feat(TUP-20080)Create migration task for all modificatios of  talend.project.
2018-07-16 14:58:29 +08:00
hcyi
eb11827947 fix(TUP-20361):the report path is not correct. (#2491)
* fix(TUP-20361):the report path is not correct.

* fix(TUP-20361):show full name of the report file on message dialog.
2018-07-16 11:40:25 +08:00
nrousseau
02ba8192a5 fix(TUP-20438) fix export with war for tdm (#2506) 2018-07-16 10:41:41 +08:00
nrousseau
18a0bbe19c Add Commandline test product (#2242)
* Add Commandline test product

* feat(TUP-20037):update version
2018-07-16 10:34:14 +08:00
Dmytro Sylaiev
2555ebeb79 feat(TDI-40559): Fix appName parameter in jdbc url (#2397) 2018-07-13 11:56:54 +03:00
jzhao
4142be0d02 feat(TDI-38814): tCreateTable support snowflake (#2475) 2018-07-13 10:39:34 +08:00
hcyi
14de8dc8d8 fix(TUP-20364):Audit can't set database "H2 Local","H2 Remote" when (#2489)
studio logon on git remote mode.
2018-07-13 09:56:17 +08:00
hcyi
0ad917285f 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-13 09:53:46 +08:00
timbault
d847ae5eae TUP-20433 - tHMap throw npe when connect to output but haven't config it (#2505) 2018-07-12 14:10:03 +02:00
Jane Ding
8f672c2c6a 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-12 17:17:43 +08:00
kjwang-talend
c2edda875b fix(TUP-20140)Checked status of items listed in Project Settings (#2504)
https://jira.talendforge.org/browse/TUP-20140
2018-07-12 15:10:51 +08:00
Anas KHABALI
229bc0988b TCOMP-903 : remove unused attributes (#2503) 2018-07-11 17:45:35 +02:00
zafkirTalend
fa5d87f55f fix(TBD-7296): Fix duplicate variable 2018-07-11 13:53:37 +02:00
SunChaoqun
24c9411514 TESB-22602:CI for ESB - Data Services and Routes - Part 3 (#2488) 2018-07-11 15:40:06 +08:00
Roman
d07a666e9b Rvoievidko/tdi 34091 parallel subjobs in t greenplum gp load (#2495)
* fix(TDI-34091): add cid to name of config file

* fix(TDI-34091): add threadId and pid to conf file name

* fix(TDI-34091): add try with resources to close PW
2018-07-11 03:33:56 -04:00
Anas KHABALI
04dc108245 TCOMP-904 : fix job classpath for tacokit components (#2494)
* TCOMP-904 : fix job classpath for tacokit components

* TCOMP-904 : keep dependencies addition order
2018-07-11 10:22:41 +08:00
Chao MENG
edf0430091 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 09:56:41 +08:00
Anas KHABALI
85892748e2 TUP-20407 : update tacokit version to 1.0.2-SNAPSHOT (#2490) 2018-07-10 16:11:26 +08:00
SunChaoqun
6e38303317 TDQ-15215:standard job tRulesurvivorship can not run on TIC, zip file (#2485)
get by build job which not check "Items" also can not run
2018-07-10 15:57:41 +08:00
Chao MENG
f72d98ded6 fix(TUP-20402): fix TaCoKit drag&drop problem, and dialog popup position problem (#2487)
fix(TUP-20402): fix TaCoKit drag&drop problem, and dialog popup position problem
2018-07-10 10:14:16 +08:00
Roman
da32df105b fix(TDI-34091): add cid to name of config file (#2482) 2018-07-09 09:46:21 -04:00
Stéphane Bouchet
4b152d1af4 fix(TESB-22695) : use the correct groupId from project. (#2483) 2018-07-09 11:05:46 +08:00
Andreas Mattes
3e11a08b5f fix(TESB-22458): Remove obsolete SAM feature setting code. (#2451)
Obsolete code for setting the SAM event feature is removed as it is causing compile errors.
2018-07-06 17:55:38 +08:00
Anas KHABALI
a71c2f59b4 TUP-20352 : handle condional outputs for tacokit components (#2479) 2018-07-06 10:18:48 +02:00
Dmytro Sylaiev
e97608f2c4 fix(TDI-40546): Fix String comparing (#2467)
* fix(TDI-40546): Fix String comparing

* fix(TDI-40546): Add null-check
2018-07-06 10:49:33 +03:00
zwxue
ad84413ea5 fix(TUP-20326):fix ref project routine install issue. (#2480) 2018-07-06 10:54:37 +08:00
Ivan Gonchar
5ce97c1894 Igonchar/tcomp 842 fix callback (#2484)
* fix(TCOMP-842): fix unused import

* fix(TCOMP-842): merge ActionParameters class into Action class

* fix(TCOMP-842): add parametersChanged field in SuggestionsAction

* fix(TCOMP-842): make server call when parameters were changed

* fix(TCOMP-842): make SuggestionsAction thread-safe

* fix(TCOMP-842): fix suggested values from label list to map<label, id>
2018-07-06 10:25:27 +08:00
hcyi
d1b7385f9e feat(TUP-20277):Deprecated storm on 7.1 (#2464) 2018-07-06 09:58:10 +08:00
Dmytro Sylaiev
06e77fba49 fix(TDI-40674): Add property to avoid windows-separator replacement (#2477) 2018-07-05 12:56:05 +03:00
zwxue
e5fd0fa9a7 feat(TUP-19996):Setup Docker as maven profile on CI. (#2435) 2018-07-05 16:39:18 +08:00
chmyga
7bbcaa289d 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-05 07:53:05 +03:00
wang wei
238620542b fix(TDI-40688): tVerticaOutput in Copy mode: Nullable Float-values are rounded to the nearest integer(#2478) 2018-07-05 10:49:38 +08:00
Roman
5fbb64d616 fix(TDI-40686): add null checker for empty passwords (#2476) 2018-07-04 03:14:59 -04:00
wang wei
5c1cf635c8 fix(TDI-40679): align to httpclient-4.5.5,httpfluent-4.5.5 and httpcore-4.4.9 (#2471) 2018-07-04 12:50:18 +08:00
Stéphane Bouchet
327b4cdcf9 fix (TDI-40403) : set a correct category (#2233) 2018-07-04 09:41:40 +08:00
Anas KHABALI
00464b5a19 fix(TCOMP-897) : fix guess schema with bulk logic for processors (#2472) 2018-07-03 09:09:27 +02:00
Ivan Gonchar
7033187db4 feat(TCOMP-842): make server call async (#2470) 2018-07-03 10:29:43 +08:00
Romain Manni-Bucau
3c91ba3e49 adding reload-component-server_16x16.png (#2469) 2018-07-03 10:16:19 +08:00
Chao MENG
80c415562c feat(TUP-20292): Support hive metastore HA (wizard) (#2443)
https://jira.talendforge.org/browse/TUP-20292
2018-07-02 16:39:02 +08:00
zwxue
808da88b70 fix(TUP-20326):Error in job generation for job migrated form 6.5.1 (#2455) 2018-07-02 10:24:55 +08:00
Anas KHABALI
31c79a19a9 TUP-20309 : integrate after group tacokit. (#2463)
This add bulk aka batch exec capabilities to tacokit components
2018-06-29 16:44:26 +02:00
Anas KHABALI
d954a99641 TUP-20309 - integrate after group code part for tacokit (#2461)
this part will add a new execution step just after the main loop to process remainning records in batch mode
2018-06-29 17:22:27 +08:00
Jane Ding
9ced1fcab5 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:12:29 +08:00
Chao MENG
c6d4f16cff 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 10:09:27 +08:00
Anas KHABALI
e35ae639e6 TUP-20349 : add chunk size as advanced common parameter for processors (#2462) 2018-06-28 17:25:20 +02:00
hcyi
1a13fd2de3 fix(TUP-20312):java.lang.StackOverflowError in 6.5.1 studio. (#2452) 2018-06-28 14:33:01 +08:00
SunChaoqun
d4e065961f TUP-20346:Preview in Metadata File fails with NullPointerException (#2458) 2018-06-28 14:09:25 +08:00
wchen-talend
384f9a9779 fix(TUP-20261):Routine editor mixed the code (#2434) 2018-06-28 09:58:14 +08:00
jzhao
10826518c8 fix(TDI-36144):SCD deactivates for type 2 records even if an inserting record is rejected(#2425) 2018-06-28 09:34:29 +08:00
Roman
0905e7d9eb Rvoievidko/tdi 40646 support both gpload and gpload.py (#2442)
* fix(TDI-40646): add two version for gpload and gpload.py

* fix(TDI-40646): change building of url for additional parameters

* fix(TDI-40646): improve logging

* fix(TDI-40646): remove empty String for cmds array

* fix(TDI-40646): some pathes now can be used from context
2018-06-27 03:47:06 -04:00
wang wei
390880e04a fix(TDI-30055): Clear memory for tSort asap (#2454) 2018-06-27 14:19:44 +08:00
SunChaoqun
6cd6a169e8 TESB-22106:CI for ESB - Data Services and Routes - On Prem - Part 2 (#2453) 2018-06-27 13:51:14 +08:00
jzhao
af80de0f4c fix(TDI-40651): old framework salesforce oauth login type job can't be import to 7.0.1(#2445) 2018-06-26 18:26:07 +08:00
hcyi
6b04aaa013 feat(TUP-20283):Improve audit report generation in studio. (#2436)
* feat(TUP-20283):Improve audit report generation in studio.

* feat(TUP-20283):Add db version support to report generation in studio.

* feat(TUP-20283):TUP-20271 Database configuration should be restore when
change DB type.

* feat(TUP-20283):Show information after generate report.

* feat(TUP-20283):update some properties.

* feat(TUP-20283):fix a bug of improve audit report generation in studio.
2018-06-26 11:31:12 +08:00
zwxue
cb8285f0c6 fix(TUP-20230):Stop job running throw Unhandled event loop exception. (#2446) 2018-06-26 10:13:01 +08:00
SunChaoqun
d2f57c48f9 TESB-22106:CI for ESB - Data Services and Routes - On Prem - Part 2 (#2447) 2018-06-25 12:47:22 +02:00
Olha Varnavina
0746554095 feat(TDI-40427): Duplicate of tSnowflakeOutput (#2295)
* registered tSnowflakeOutputBulkExec as unified tDbOutputBulkExec
2018-06-25 11:34:51 +03:00
SunChaoqun
977d9a25b8 TESB-22483:CI for ESB - Build Data Service using Jenkins will get an error (#2444)
* 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-06-25 09:22:17 +02:00
SunChaoqun
2c0b5cac3d TESB-22487:OSGI Bundle should be exported when using ESB components (#2426)
* TESB-22487:OSGI Bundle should be exported when using ESB components

* TESB-22487:OSGI Bundle should be exported when using ESB components
2018-06-25 08:54:01 +02:00
Roman
59537440bb fix(TDI-40645): driver name was uppercased (#2441) 2018-06-22 05:19:52 -04:00
kjwang-talend
d44d4c4e8d 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-22 17:17:41 +08:00
Roman
bedaf68488 Rvoievidko/tdi 40496 support for green plum 5.x (#2402)
* feat(TDI-40496): update driver for GPLoad component

* feat(TDI-40496): change driver for all components in GP family

* feat(TDI-40496): add greenplum driver to tPostgreSQLBulkExec

* feat(TDI-40496): integrate code from TDI-40582

* feat(TDI-40496): Add PostgreSQL driver as default

* feat(TDI-40496): change driver for tGreenplumELT

* feat(TDI-40496): change getValue from prevNode
2018-06-22 04:30:38 -04:00
mbasiuk-talend
cc048b629c Mbasiuk/tdi 34637 dynamic mysql update (#2437)
* feat(TDI-34637): make a first implementation of the feature

* feat(TDI-34637): fix query string definition

* feta(TDI-34637): implement feature for rest data actions

* feat(TDI-34637): fix support null in where clause

* feat(TDI-34637): fix insert or update on duplicate key update
2018-06-22 10:40:22 +03:00
dlin-talend
6928ac709a feat(TUP-20277):Deprecated items on 7.1 (#2438) 2018-06-22 10:31:58 +08:00
Liu Xinquan
9b73a66d87 TDQ-15455 Compile error after refactoring job (#2428) 2018-06-21 15:25:05 +08:00
Jane Ding
7c56a9a2ea 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.
2018-06-20 15:07:14 +08:00
Chao MENG
33d7e04d59 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 10:57:22 +08:00
Roman
561224d256 fix(TDI-40460): change slf4j version (#2422) 2018-06-18 10:57:53 -04:00
hcyi
2e6ff99d05 feat(TUP-20034):Audit in project settings - Add advanced setting for full DB setup configuration. (#2388)
* feat(TUP-20033):Audit in project settings in studio.

* feat(TUP-20033):improve for Audit in project settings in studio.

* feat(TUP-20033):improve to use h2 for Audit in project settings in
studio.

* feat(TUP-20033):improve to generate Audit in project settings in studio.

* feat(TUP-20033):improve to generate Audit in project settings in studio.

* feat(TUP-20033): fix TUP-20175 Generate successfully if not set audit
report folder on studio.

* feat(TUP-20034):add the basic GUI part and load default value from
templte file and save/load db info into *.prefs file .

* feat(TUP-20034):Check db connection for the Audit in project settings.

* feat(TUP-20034):Audit in project settings - Add advanced setting for
full DB setup configuration.

* feat(TUP-20035):Audit in project settings - Generate report from
history.

* feat(TUP-20035):Audit in project settings - Generate report from
history.

* feat(TUP-20035):Audit in project settings - Generate report from
history.

* feat(TUP-20035):test and improve to generate report from history.
2018-06-15 17:13:31 +08:00
Jane Ding
f86d283c09 fix(TUP-19603)Suffix number is not proper when drag DB connection to a (#2418)
* fix(TUP-19603)Suffix number is not proper when drag DB connection to a
job
https://jira.talendforge.org/browse/TUP-19603

* fix(TUP-19603)Suffix number is not proper when drag DB connection to a
job
A better solution

* fix(TUP-19603)Suffix number is not proper when drag DB connection to a
job
A better solution
2018-06-15 14:33:40 +08:00
Ivan Gonchar
b991d09911 Igonchar/tcomp 842 2 (#2419)
* feat(TCOMP-842): implement AbstractValueSelectionController

* fix(TCOMP-842): fix NPE when value is null

* feat(TCOMP-842): implement ParameterResolver interface and its abstract implementation

* fix(TCOMP-842): change type parameter from String to enum in Action

* fix(TCOMP-842): fix type in CheckElementParameter javadoc

* feat(TCOMP-842): add suggestions to PropertyDefinitionDecorator

* feat(TCOMP-842): implement SuggestionsAction

* feat(TCOMP-842): implement ValueSelectionParameter

* feat(TCOMP-842): implement ActionParametersUpdater

* feat(TCOMP-842): implement SuggestionsResolver

* fix(TCOMP-842): change type parameter from String to enum in Action

* feat(TCOMP-842): setup ValueSelectionParameter during Settings creation

* feat(TCOMP-842): implement value selection widget for tacokit

* fix(TCOMP-842): remove unused constructors in SuggestionValues

* fix(TCOMP-842): fix ValueSelectionDialog labels

* fix(TCOMP-842): fix SuggestionsAction.callback() method

* feat(TCOMP-842): update component-runtime version to 1.0.1-SNAPSHOT

* fix(TCOMP-842): fix component server dependency and temporarily add oss snapshots repo

* fix(TCOMP-842): fix compile error with WidgetMapper
2018-06-15 14:08:34 +08:00
wang wei
9391806f52 Revert "fix(TDI-40162): remove the unnecessary talend-codegen-utils.jar register for runtime(#2002)"(#2420) 2018-06-15 12:05:29 +08:00
wchen-talend
c264b8cc6c 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-14 18:08:07 +08:00
Roman
aa7eb40c90 fix(TDI-40454): change name for conforming_string func (#2414) 2018-06-14 04:20:05 -04:00
wang wei
a9f6c03ca5 fix(TDI-40162): remove the plugin.xml include statement (#2417) 2018-06-14 16:05:18 +08:00
wang wei
3cb3074053 fix(TDI-40162): remove the unnecessary talend-codegen-utils.jar register for runtime(#2002) 2018-06-14 15:39:10 +08:00
dlin-talend
a288d00026 fix(TUP-20258):"Generate Doc As HTML" Item Does not Exist for BD (#2412)
Streaming Job
2018-06-14 13:55:21 +08:00
Jane Ding
f4fa521be5 revert fix(TUP-19603)Suffix number is not proper when drag DB connection (#2416)
to a job
2018-06-14 13:46:53 +08:00
Chao MENG
60629c5465 Revert "Igonchar/tcomp 842 (#2405)" (#2415)
This reverts commit 79bfaad0c3.
2018-06-14 11:56:49 +08:00
Ivan Gonchar
79bfaad0c3 Igonchar/tcomp 842 (#2405)
* feat(TCOMP-842): implement AbstractValueSelectionController

* fix(TCOMP-842): fix NPE when value is null

* feat(TCOMP-842): implement ParameterResolver interface and its abstract implementation

* fix(TCOMP-842): change type parameter from String to enum in Action

* fix(TCOMP-842): fix type in CheckElementParameter javadoc

* feat(TCOMP-842): add suggestions to PropertyDefinitionDecorator

* feat(TCOMP-842): implement SuggestionsAction

* feat(TCOMP-842): implement ValueSelectionParameter

* feat(TCOMP-842): implement ActionParametersUpdater

* feat(TCOMP-842): implement SuggestionsResolver

* fix(TCOMP-842): change type parameter from String to enum in Action

* feat(TCOMP-842): setup ValueSelectionParameter during Settings creation

* feat(TCOMP-842): implement value selection widget for tacokit

* fix(TCOMP-842): remove unused constructors in SuggestionValues

* fix(TCOMP-842): fix ValueSelectionDialog labels

* fix(TCOMP-842): fix SuggestionsAction.callback() method

* feat(TCOMP-842): update component-runtime version to 1.0.1-SNAPSHOT
2018-06-14 10:47:53 +08:00
Jane Ding
6a7391cfd7 solve some junit failure (#2407) 2018-06-14 10:21:01 +08:00
Ivan Gonchar
cfa21c987c fix(TCOMP-865): fix NPE when not Tacokit connection is checked (#2413) 2018-06-14 10:08:10 +08:00
Ivan Gonchar
a09abd3c74 feat(TCOMP-842): implement AbstractValueSelectionController (#2406) 2018-06-13 10:20:09 +08:00
zafkirTalend
4c72b73d86 feat(TBD-6950): Add location tBigQueryInput (#2403) 2018-06-12 16:49:15 +02:00
qiongli
47c505e372 fix(TDQ-15215): No need to run 'include-survivorship-rules' sice the (#2404)
rules in src/main/resources. they will be in jar/zip when build the
maven job
2018-06-12 17:22:21 +08:00
Jane Ding
965a794b97 fix(TUP-19603)Suffix number is not proper when drag DB connection to a (#2400)
job
https://jira.talendforge.org/browse/TUP-19603
2018-06-11 10:38:32 +08:00
Jane Ding
3f2ed07e5d 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
2018-06-11 10:29:56 +08:00
Chao MENG
8d277de70d 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 15:54:51 +08:00
zwxue
c5fdf54dbf fix(TUP-20223):Wrong branch value in the jobs generated by CI. (#2394) 2018-06-08 10:19:40 +08:00
wchen-talend
22e0eca696 fix(TUP-20021):Deactive component will change the execution order (#2390) 2018-06-07 15:42:52 +08:00
wchen-talend
2dc5b46811 Revert "fix(TUP-20210):Strange behavior on component tNLPModel for required" (#2392)
* Revert "Igonchar/tcomp 816 (#2332)"

This reverts commit c76a0d430f.

* Revert "fix(TUP-18501)Error trying to do memory run (#2382)"

This reverts commit 50f6d70964.

* Revert "fix(TUP-20210):Strange behavior on component tNLPModel for required (#2384)"

This reverts commit e9c6dc3f98.
2018-06-07 15:18:58 +08:00
Ivan Gonchar
c76a0d430f Igonchar/tcomp 816 (#2332)
* fix(TCOMP-816): improve ConfigType handling in TaCoKitConfigurationModel

* fix(TCOMP-816): move setters to TaCoKitConfigurationModel constructor to ensure instance is correct after instantiation

* fix(TCOMP-816): avoid duplication in TaCoKitConfigurationModel constructor

* fix(TCOMP-816): clean TaCoKitConfigurationModel API

* feat(TCOMP-816): implement Tacokit metadata migration during import

* fix(TCOMP-816): fix migration

* fix(TCOMP-816) try to fix updated related jobs

* feat(TCOMP-816): implement Tacokit process migration during import

* fix(TCOMP-816): set correct version after migration

* fix(TCOMP-816): preserve technical parameters

* fix(TCOMP-816): fix small warnings

* fix(TCOMP-816): persist Tacokit component id in process item

* fix(TCOMP-816): fix technical parameters field type in Process item

* fix(TCOMP-816): clean TaCoKitProcessMigrator class

* fix(TCOMP-816): clean TaCoKitMigrationManager

* feat(TCOMP-816) implement process migration during Studio start-up

* fix(TCOMP-816): remove updateDBConnection() call as it doesn't update related processes

* feat(TCOMP-816): add progress monitor messages

* feat(TCOMP-816): implement related items update after metadata is migrated during import
2018-06-06 10:28:03 +08:00
Jane Ding
50f6d70964 fix(TUP-18501)Error trying to do memory run (#2382)
* fix(TUP-18501)Error trying to do memory run
https://jira.talendforge.org/browse/TUP-18501
Add a pause at start until get the active jvm info for memory run.

* fix(TUP-18501)Error trying to do memory run
https://jira.talendforge.org/browse/TUP-18501
Change message box to process monitor

* fix(TUP-18501)Error trying to do memory run
https://jira.talendforge.org/browse/TUP-18501
sorry, wrong write of key
2018-06-06 10:01:25 +08:00
wchen-talend
e9c6dc3f98 fix(TUP-20210):Strange behavior on component tNLPModel for required (#2384)
module protobuf-java-2.6.1.jar
2018-06-05 18:34:26 +08:00
Dmytro Sylaiev
31093fab13 fix(TDI-40530): Make creating multiple directories working for linux server (#2369) 2018-06-05 12:53:15 +03:00
Vladimir Bogatyrov
4873733fb8 [TESB-20335] tESBConsumer not using http conduits when called from within a subjob (#2381) 2018-06-05 11:14:22 +08:00
jzhao
56ed0cf216 fix(TDI-40441): remove duplicate item in cipher siute list for mom components(#2385) 2018-06-05 10:53:33 +08:00
achursin-talend
e58af64972 fix(TBD-6923): Fix using hive query name (#2383) 2018-06-04 15:44:19 +02:00
Yu
fc49fbe69a feat/TBD(6717) Update hive components for qubole integration (#2324)
* feat(TBD-6717) Launch Pig (load->store) job on Qubole

* update some hive components

* Modify UI for tHive Connection & remove localprovider project changes

* add tHiveClose codes for Qubole

* update for tHiveConnection

* update for Hive connection

* update for hive connection

* hive close & hive connection & hive row

* finish Hive

* deal with jars add for parquet

* ajust options for qubole

* update for hive

* update display

* address comments
2018-06-04 14:33:00 +03:00
Dmytro Sylaiev
b346ec31dc fix(TDI-40526): Update json-lib dependency (#2359)
* fix(TDI-40526): Update json-lib dependency

* fix(TDI-40526): Remove urlpaths of jar
2018-06-04 12:42:07 +03:00
zwxue
920670b049 fix(TUP-20217):Can't run a job including a tRunjob component. (#2373) 2018-06-04 16:49:12 +08:00
hcyi
530df5a648 feat(TUP-20033):Audit in project settings in studio. (#2371)
* feat(TUP-20033):Audit in project settings in studio.

* feat(TUP-20033):improve for Audit in project settings in studio.

* feat(TUP-20033):improve to use h2 for Audit in project settings in
studio.

* feat(TUP-20033):improve to generate Audit in project settings in studio.

* feat(TUP-20033):improve to generate Audit in project settings in studio.

* feat(TUP-20033): fix TUP-20175 Generate successfully if not set audit
report folder on studio.

* feat(TUP-20033):Audit in project settings in studio.
2018-06-04 15:20:41 +08:00
Andreas Mattes
b2fd2c99da fix(TESB-22183): Small enhancement to WSDL circular import fix and testing. (#2376)
* fix(TESB-22183): Add support for circular WSDL imports to WSDLLoader.

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.
Auf Branch bugfix/master/TESB-22183
�nderungen, die nicht zum Commit vorgemerkt sind:
	ge�ndert:       main/plugins/org.talend.designer.core/.classpath
Unversionierte Dateien:
	test/plugins/org.talend.designer.webservice.test/src/org/talend/designer/webservice/test/ServiceDiscoveryHelperTest.java
keine �nderungen zum Commit vorgemerkt (benutzen Sie "git add" und/oder "git commit -a")

* fix(TESB-22183): Enhanced unit test for handling WSDL with circular imports.
2018-06-04 08:36:56 +02:00
Roman
9864529bcb fix(TDI-40448): creating of yaml file was fixed (#2314)
* fix(TDI-40448): creating of yaml file was fixed
2018-06-01 06:42:48 -04:00
ypiel
9ef7f5083a fix(TDI-40521) : Encode to base64 byte[]->String (#2346) (#2374) 2018-06-01 11:55:36 +02:00
wang wei
b2f61ed0ae fix(TDI-40522):reuse the common batch execute javajet (#2372) 2018-06-01 15:42:55 +08:00
kjwang-talend
12fedd0ffa TUP-20199 Studio is way too slow when branching 2 ways with if condition (#2370)
https://jira.talendforge.org/browse/TUP-20199
2018-06-01 14:49:40 +08:00
wchen-talend
0721c10cec fix(TUP-20021):Deactive component will change the execution order (#2368) 2018-05-31 10:47:36 +08:00
Andreas Mattes
7645f53591 fix(TESB-22183): Add support for circular WSDL imports to WSDLLoader. (#2367)
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-05-31 10:22:57 +08:00
mbasiuk-talend
21d01ffa46 fix(TDI-40511): align talend-codegen-utils version (#2366) 2018-05-30 17:56:26 +03:00
mbasiuk-talend
d844ffa9ec Mbasiuk/tdi 40511 design schema mapping (#2365)
* fix(TDI-40511): add index mapping for missing field in runtime schema

* fix(TDI-40511): fix issues with ordering

* fix(TDI-40511): replace magic numbers with constant.

* fix(TDI-40511): bump versions
2018-05-30 17:44:18 +03:00
Dmytro Sylaiev
1806fa9bf2 Dsylaiev/tdi 40526 add talend version of json lib to libs plugin (#2364)
* fix(TDI-40526): Add patched json-lib to libs_src

* fix(TDI-40526): Fix pom.xml

* Add missing nexus url to properties
2018-05-30 16:40:39 +03:00
Dmytro Sylaiev
2d5255d993 fix(TDI-40526): Add patched json-lib to libs_src (#2358) 2018-05-30 14:50:41 +03:00
Mike Yan
e183f3f2d0 fix(TESB-22267):Add binary setting as build for micrsoervice (#2362) 2018-05-30 16:34:16 +08:00
zwxue
5e5d6ef3f1 fix(TUP-20194):Fail to publish job by commandline with missing log4j jar (#2356)
for migrated job.
2018-05-29 14:52:26 +08:00
wang wei
3153d9e386 fix(TDI-39874): Numeric.sequence increments by 2 instead of 1 in tXMLMap(#2353) 2018-05-29 14:05:19 +08:00
hbhong
4537547c2b TMDM-12082: Fixed throwing "java.lang.ClassCastException" while creating new version and open MDM Object from repository view (#2355) 2018-05-29 11:18:38 +08:00
Jane Ding
e4f35ad165 fix junit failure (#2354)
org.talend.designer.mapper.utils.problems.ProblemsAnalyserTest.testCheckLookupTablesKeyProblems
org.talend.designer.mapper.utils.problems.ProblemsAnalyserTest.testGetLookupTableProblem
org.talend.designer.runprocess.ui.ProcessErrorUtilTest.testGetAllErrorMess
2018-05-29 09:35:59 +08:00
Chao MENG
2516850f5c 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 16:21:31 +08:00
Pingwen Lin
b6f9635d2b TMDM-12258 tMDMOutput get compile issue (#2352) 2018-05-28 15:08:58 +08:00
Mike Yan
3c14722854 fix(TESB-22267):Fail to build Rest Service job as microservice for NPE (#2351) 2018-05-28 14:28:18 +08:00
Pierre Teyssier
c3f75992d5 feat(TDI-40477): Split Snowflake components (#2350)
* split logic of components on definition and runtime
2018-05-28 12:05:03 +08:00
Mike Yan
541a43930b fix(TESB-22105): Change ProcessItem to Item to support service type (#2349)
* feat(TESB-22105) CI for ESB Services

* fix(TESB-22105): Change ProcessItem to Item to support service type
2018-05-25 18:08:06 +08:00
wang wei
693947594f fix(TDI-40522): tAS400Output return wrong NB_line with BatchSize (#2347) 2018-05-25 17:31:12 +08:00
pyzhou
fee251b234 fix(TDI-39088):Change the method of test S3 connection. (#2342)
* fix(TDI-39088):Change the method of test S3 connection.

* fix(TDI-39088):add an option in advance setting. (#2343)
2018-05-25 10:09:45 +08:00
Jane Ding
9efff8edaf fix(TUP-18501)Modify the confusing message (#2344)
https://jira.talendforge.org/browse/TUP-18501
2018-05-24 18:27:48 +08:00
pyzhou
e73747132b fix(TDI-33629):Migration Task for tNormalize. (#2339) 2018-05-24 17:56:57 +08:00
nrousseau
0e7e65b287 fix(TUP-19731) (#2338)
Allow to use virtual component with rows_end setup as start in the
process
2018-05-24 16:02:34 +08:00
jzhao
bbc937f398 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 15:48:55 +08:00
zwxue
ac405fbea7 workitem(TUP-20169):upgrade log4j-1.2.16.jar to log4j-1.2.17.jar (#2340) 2018-05-24 14:43:59 +08:00
Denis Sergent
84a078a5a1 TESB-22230 NPE in build process wizard when changing build type (#2337) 2018-05-24 13:55:02 +08:00
Stéphane Bouchet
82be89c039 fix(TESB-21830): deployment tab not shown (#2260)
* fix(TESB-21830) : deployment tab not shown when selecting service

* fix(TESB-21830) : deployment tab not shown when selecting service
2018-05-23 16:45:39 +02:00
Andreas Mattes
bedac0daf5 fix(TESB-22034): Fix handling of non-required bean deps in routes. (#2336)
The present fix enables selection of the "required" state of bean libraries in the corresponding dialog.
2018-05-23 16:44:24 +02:00
mbasiuk-talend
e8456883a6 fix(TDI-40512): add release resources for VerticaOutput and JavaDBOutput (#2331) 2018-05-23 10:06:12 +03:00
hcyi
20e9242246 fix(TUP-20138):Importing projects with "Copy projects into workspace" (#2333)
unchecked copies the project to a temporary folder.
2018-05-23 10:46:09 +08:00
pyzhou
1a596bf2dd fix(TDI-33629):tNormalize have compile error. (#2335) 2018-05-23 10:18:50 +08:00
Dmytro Sylaiev
933273788d fix(TDI-40525): Fix check for directory existing (#2334) 2018-05-22 17:44:18 +03:00
Chao MENG
34d9293c86 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:30:49 +08:00
pyzhou
6bc2dc1e31 Pyzhou/tdi 33629 t normalize do not support context (#2296)
* Revert "fix(TDI-33629): tNormalize support context. (#2279)"

This reverts commit 8a7dc24720.

* fix(TDI-33629):tNormalize doesn't support context

* fix(TDI-33629):Avoid NPE and check empty value.
2018-05-22 11:06:18 +08:00
mbasiuk-talend
e78b01ae11 fix(TDI-40511): add index mapping for missing field in runtime schema (#2327)
* fix(TDI-40511): add index mapping for missing field in runtime schema

* fix(TDI-40511): fix issues with ordering

* fix(TDI-40511): replace magic numbers with constant.
2018-05-21 17:24:36 +03:00
Dmytro Sylaiev
53c20d3190 fix(TDI-40513): Fix compile error for contated strings in FileName (#2329) 2018-05-21 14:00:01 +03:00
pyzhou
8ad991fc40 fix(TDI-40487):NPE with Netsuite dev Account. (#2325) 2018-05-21 17:55:20 +08:00
Mike Yan
128e138753 feat(TESB-22105) CI for ESB Services (#2328) 2018-05-21 16:00:00 +08:00
wchen-talend
a50d0ac54b fix(TUP-20021):Deactive component will change the execution order (#2315) 2018-05-21 14:18:42 +08:00
wang wei
432d173610 fix(TDI-40492): align all the log4j to 1.2.17 version 2018-05-21 10:36:18 +08:00
Chao MENG
1994f5fea1 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:10:13 +08:00
wchen-talend
6503d48768 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-21 10:07:04 +08:00
Chao MENG
7985717125 fix(TUP-20144): UI:String "Modification" can not show completely even (#2326)
max the window
https://jira.talendforge.org/browse/TUP-20144
2018-05-21 09:47:11 +08:00
Dmytro Sylaiev
798431a04b fix(TDI-32027): Fix CreatesqlQuery generation for postgres (#2287)
* fix(TDI-32027): Fix CreatesqlQuery generation for postgres

* fix(TDI-32027): Not add precision when length is null
2018-05-18 15:56:35 +03:00
zafkirTalend
a28f495492 fix(TBD-6701): Fix conflict (#2320) (#2321) 2018-05-17 16:00:23 +02:00
Emmanuel GALLOIS
ef668b1ce1 fix(TDI-40495): avoid NPE when LEAD_SELECTOR does not exist (#2310) 2018-05-17 11:29:40 +02:00
Dmytro Sylaiev
d064b04b59 Dsylaiev/tdi 40186 add move dir tftpfileexist (#2269)
* feat(TDI-40186): Implement MoveDir property for tFTPFileExist

* feat(TDI-40186): Implement migration task

* Set false to new property for old jobs

* chore(TDI-40186): Refactoring migration task

* fix(TDI-40186): Fix not returning to root issue
2018-05-17 11:33:39 +03:00
zwxue
2036438529 fix(TUP-19754):mvn package fail when main project use subref project's (#2316)
job.
2018-05-17 09:38:58 +08:00
Roman
f51a3308b5 fix(TDI-40500): change Postgresqldriver from 8.3 to 8.4 (#2318) 2018-05-16 17:45:36 +03:00
Dmytro Sylaiev
87c9450bc7 fix(TDI-40474): Make it possible to create multiple dirs in tFTPPut SFTP (#2309)
* fix(TDI-40474): Make it possible to create multiple dirs in tFTPPut SFTP

* chore(TDI-40474): Remove unused local variable
2018-05-16 11:35:48 +03:00
Anas KHABALI
43fea82154 fix(TDI-40473): fix date handling in tservicenowOutput (#2306) 2018-05-16 09:35:20 +02:00
Andreas Mattes
9420fc6686 fix(TESB-22036): Add read access to list of bundles in FeaturesModel. (#2313)
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:12:01 +02:00
Jane Ding
8e0dce3d8f fix(TUP-19999)column cannot be mapped when column name is Half-width (#2308)
* fix(TUP-19999)column cannot be mapped when column name is Half-width
figures+full width underscore
https://jira.talendforge.org/browse/TUP-19999

* fix(TUP-19999) solve the messy code of last commit
2018-05-15 18:15:09 +08:00
Dmytro Sylaiev
8cd6ded065 fix(TDI-40491): Make ftpfileexist layout more reasonable (#2307) 2018-05-14 18:58:18 +03:00
Jenkins Continuous Build server
6ec894191a Set version to 7.1.1 SNAPSHOT 2018-05-11 17:08:04 +02:00
Denis Sergent
d0697253a4 TUP-20129 Studio graphical improvements (#2300)
* Studio graphical improvements

Fixed some graphical inconsistencies in Studio (borders, margins...)
2018-05-11 11:19:10 +02:00
jzhao
b67da50407 feat(TDI-39901): tRedshiftXX - AWS Settings (#2240) 2018-05-11 10:45:29 +08:00
Ivan Gonchar
e9fac0cf44 Igonchar/tcomp 801 (#2303)
* feat(TCOMP-801): set type name for newly created ConnectionItem

* feat(TCOMP-801): move Config Type Node to ItemModel

* fix(TCOMP-801): fix Tacokit metadata import issue

* fix(TCOMP-801): fix getComponentValue() method call in UpdateNodeParameterCommand

* fix(TCOMP-801): fix exception reporting

* fix(TCOMP-801): exclude label and button from persistance in metadata repository

* fix(TCOMP-801): add javadoc for TaCoKitImportHandler
2018-05-10 18:54:20 +03:00
Jane Ding
9e5b3a72ce fix(TUP-19815)For can't find process (#2304) 2018-05-10 16:06:31 +08:00
jzhao
251b4c3285 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 15:51:30 +08:00
zwxue
9267eb40c9 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:46:15 +08:00
wang wei
ed6597d02a fix(TDI-40318): Talend FTP permission issue (#2298) 2018-05-09 17:59:24 +08:00
mbasiuk-talend
6551e7ca36 Mbasiuk/tdi 36564 input resultset isclosed issue (#2294)
* fix(TDI-36564): remove condition for isClosed

* fix(TDI-36564): remove isClosed condition from inputs
2018-05-08 16:33:40 +03:00
Roman
2142e54930 fix(TDI-40484): FileReader was closed (#2293)
* fix(TDI-40484): FileReader was closed
2018-05-08 12:33:20 +03:00
wang wei
c0f7d01261 fix(TDI-40408): remove groovy-all-1.7.0.jar for CVE Vulnerabilities (#2292) 2018-05-08 15:48:11 +08:00
pyzhou
8a7dc24720 fix(TDI-33629): tNormalize support context. (#2279)
* fix(TDI-33629): tNormalize support context.

* fix(TDI-33629):compile error.
2018-05-08 15:41:40 +08:00
jzhao
d303fa45ff fix(TDI-40479): typo issue for property of tMomxxx component (#2291)
* typo issue
* remove useless i18n in tmomconnection
2018-05-08 11:27:26 +08:00
Jane Ding
e226540dde 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 10:51:19 +08:00
mbasiuk-talend
b3441c269b fix(TDI-36564): remove condition for isClosed (#2289) 2018-05-07 14:56:51 +03:00
Olha Varnavina
40fbf3e163 fix(TDI-37800): tWriteJsonField handle Arrays (#2282)
* fix(TDI-37800): tWriteJsonField handle Arrays
* fixed String value of array in case class attribute is set to array

* fix(TDI-37800): tWriteJsonField handle Arrays
* cleaned up unused statement
2018-05-07 12:11:00 +03:00
mbasiuk-talend
eaee3bb314 fix(TDI-36564): release resources for Row components (#2236)
* fix(TDI-36564): release resources for Row components

* fix(TDI-36564): update tJavaDBRow

* fix(TDI-36564): remove unnecessary commit

* fix(TDI-36564): put flag for closed connection
2018-05-07 09:59:07 +03:00
mbasiuk-talend
32d2ff9311 Mbasiuk/tdi 36564 release resources (#2222)
* fix(TDI-36564): add closing result sets and statements for input components

* (TDI-36564): fix try with resources for table action

* fix(TDI-36564): modify abstract finally javajet

* fix(TDI-36564): update tAS400Output component

* fix(TDI-36564): update tAccessOutput component

* fix(TDI-36564): update tAmazonMysqlOutput component

* fix(TDI-36564): update tAmazonOracleOutput component

* fix(TDI-36564): update tDB2Output component

* fix(TDI-36564): update tEXAOutput component

* fix(TDI-36564): fix issue with casting

* fix(TDI-36564): update several components

* fix(TDI-36564): update last output components

* fix(TDI-36564): fix release resources for special cases

* fix(TDI-36564): close rs and stmt in other ouput parts

* fix(TDI-36564): remove file commited by mistake

* fix(TDI-36564): improve statements close condition

* fix(TDI-36564): revert changes for identity, prevent compilation errors

* fix(TDI-36564): update closing logic, add statement close flag

* fix(TDI-36564): add release resources for copy operation
2018-05-07 09:58:49 +03:00
Chao MENG
68ba480b94 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 17:48:46 +08:00
Ivan Gonchar
26a78a2579 Igonchar/tcomp 794 (#2262)
* fix: refactor TaCoKitDragAndDropHandler.getComponentValue()

* fix: refactor ValueModel class

* fix: fix small issues in TaCoKitDragAndDropHandler

* fix(TCOMP-794): extend visibility PropertyDefinitionDecorator API

* fix(TCOMP-794): fix TaCoKitDragAndDropHandler to handle metadata prefix correctly

* fix(TCOMP-794): remove unused methods from PropertyNode
2018-05-04 12:11:56 +03:00
Dmytro Sylaiev
01a914f3a1 feat(TDI-18708): Implement creating directory tFTPPut (#2252)
* feat(TDI-18708): Implement creating directory tFTPPut

* Add 'createDir' checkbox

* Implement creating directory for FTP,SFTP and FTPS

* feat(TDI-18708): Fix code smells
2018-05-04 11:28:10 +03:00
Roman
cffb92808c Rvoievidko/tdi 37254 t postgresql output bulk exec add copy command for local files (#2261)
* feat(TDI-37254): add checkbox and properties

* feat(TDI-37254): add CopyManager to insert bulk

* feat(TDI-37254): add CopyManager to update bulk

* fix(TDI-40455): change driver for prior v9 versions

* fix(TDI-40455): change driver groupId/artifactId

* feat(TDI-37254): remove UrlPath for DB driver
2018-05-04 11:22:05 +03:00
Chao MENG
7905978158 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 12:27:10 +08:00
zwxue
5a24a420f7 fix(TUP-20065):Commandline can not logon a project with subref project (#2283)
after do initLocal.
2018-05-04 11:33:26 +08:00
hcyi
598ebc9f30 fix(TUP-18661):Errors on component. (#2244) 2018-05-04 10:09:46 +08:00
Ivan Gonchar
3e484e4d0c fix(TCOMP-795): turn on tacokit plugin tests (#2281) 2018-05-03 15:23:25 +03:00
Jane Ding
9228067546 feat(TUP-20041)Propagate Smart tMap Initative to Spark and Spark (#2267)
streaming jobs
https://jira.talendforge.org/browse/TUP-20041
2018-05-03 15:54:23 +08:00
kjwang-talend
cd2e1b9b1f fix(TUP-20027)Error opening job: Unhandled event loop exception (#2276)
(java.lang.StackOverflowError)
https://jira.talendforge.org/browse/TUP-20027
2018-05-03 15:41:16 +08:00
Romain Manni-Bucau
03a079050a TCOMP-763 adding a refreh button in the toolbar (#2268) 2018-05-03 09:40:54 +02:00
Chao MENG
bd4ce26d0f 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:12:20 +08:00
Mike Yan
6de13efc75 TESB-20335: revert for Job compile errors (#2275) 2018-05-03 14:10:21 +08:00
pyzhou
e3d23b6343 fix(TDI-40458):compile error dynamic schema with identity tsybaseOutput (#2274) 2018-05-02 19:55:16 +08:00
Anas KHABALI
b8f8abd6be 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 11:45:39 +02:00
Jane Ding
706c6d679f 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-02 17:43:30 +08:00
Chao MENG
fe14a311ed 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 15:41:57 +08:00
Vladimir Bogatyrov
17b0678897 [TESB-20335] tESBConsumer not using http conduits for receive timeout when called from within a subjob using tRunJob (#2271) 2018-05-02 14:40:26 +08:00
zwxue
54806dbdb4 workitem(TUP-19975): Add / Review junits for CI. (#2270) 2018-05-02 10:24:36 +08:00
Chao MENG
ecefdadfe6 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:22:06 +08:00
Chao MENG
326f1090f3 fix(TUP-19961): tELTMSSqlInput component does not support the schema (#2265)
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 16:35:46 +08:00
pyzhou
6f6dd18ed2 fix(TDI-40451):remove the default module of tJMSXXX components. (#2263) 2018-04-27 15:25:58 +08:00
zwxue
79640a43c7 workitem(TUP-19975):Add / Review junits for CI. (#2259) 2018-04-26 10:35:26 +08:00
Mike Yan
a2d057a24b TESB-21804: Filter out camel-alldeps in MANIFEST for OSGi type export (#2256)
* TESB-21576: Add tREST component in OSGi build type validation

* TESB-21804: Filter out camel-alldeps in MANIFEST for OSGi type export
2018-04-24 18:54:14 +08:00
kjwang-talend
bcc77f6e64 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:28:08 +08:00
chmyga
f15fb71b7d fix(TCOMP-792): ActiveIf for enums (#2253)
* Clean controls map
2018-04-24 11:28:16 +03:00
kjwang-talend
eeeeb60faf 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 11:04:41 +08:00
kjwang-talend
090ba8a348 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 10:58:37 +08:00
chmyga
f2ec017bcd fix(TCOMP-783): activeifs doesnt work (#2247)
* Add converting value to string
2018-04-20 17:32:14 +03:00
Denis Sergent
549374cc78 TESB-21832 Problems with job/route exec. with local runtime in Studio (#2245)
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-20 17:24:29 +08:00
hcyi
0f3e636222 fix(TUP-18682):PDF layout of generated document in multi-byte character (#2239)
on studio is broken.
2018-04-20 10:58:23 +08:00
jzhao
c623b8ea6a feat(TDI-39817):Restrict number of messages in websphere in tMomInput Component (#2206)
* show the param for webspheremq

* implement it in the runtime part
2018-04-19 11:31:15 +08:00
wchen-talend
46daeba813 fix(TUP-19820):The joblet input row issue (#2237) 2018-04-19 10:12:22 +08:00
chmyga
73e2042c45 feat: additional dependencies for beam components (#2241)
* Change marker dependency for beam components
2018-04-19 09:54:40 +08:00
Ivan Gonchar
fc61b8e54d chore: bump Tacokit version to 0.0.9 (#2235) 2018-04-17 18:52:30 +08:00
Mike Yan
37dcd340d9 TESB-21576: Add tREST component in OSGi build type validation (#2234) 2018-04-17 17:11:04 +08:00
Denis Sergent
835846e2a9 TESB-21825 TOS for ESB should not allow building jobs as microservice (#2230)
Job build wizard displays ESB microservice as a possibility to build the
jobs. Build as microservice won't work in TOS for ESB version. This
removes Microservice from buid type combo box when product is TOS.
2018-04-17 14:29:35 +08:00
wang wei
294ba4d8f5 fix(TDI-40318): fix FTP permission issue for tFTPPut component sftp mode (#2199) 2018-04-17 13:46:54 +08:00
Chao MENG
ec7f602e37 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:41:25 +08:00
Jane Ding
5c63d7204f fix(TUP-19604)Issue about studio palette (#2223)
https://jira.talendforge.org/browse/TUP-19604
Upper the priority display of full matched component family.
2018-04-16 10:53:07 +08:00
hcyi
dce3605c5b fix(TUP-19292):Technical Status created does not appear under Job (#2202)
Status.
2018-04-16 10:17:39 +08:00
Chao MENG
05509ee054 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-13 10:56:01 +08:00
Ivan Gonchar
e443b50e4e Igonchar/tcomp 755 2 (#2226)
* fix(TCOMP-755): remove unused TacokitConnector

* fix(TCOMP-755): add IAdditionalInfo interface for TaCoKitNodeConnector

* fix(TCOMP-755): set tacokit connector type in TaCoKitNodeConnector during creation
2018-04-13 10:29:52 +08:00
Ivan Gonchar
99b2a0f1cb fix(TCOMP-755): fix sync columns issue (#2225)
* fix(TCOMP-755): fix sync columns issue

* fix(TCOMP-755): fix method checking whether connector is tacokit
2018-04-13 10:29:22 +08:00
Anas KHABALI
b192293210 integrate enum (closed list) display name (#2221)
This PR contains a fix of dynamic values in closed list
2018-04-12 16:15:01 +08:00
Anas KHABALI
16d867c0d2 upgrade tcompv1 version to 0.0.6 (#2220) 2018-04-12 16:10:50 +08:00
kjwang-talend
003904f000 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-12 15:42:46 +08:00
jzhao
f60ef0313e fix(TDI-40271): [6.4.1] tMomInput is not retrieving USR properties and JMS headers from IBM MQSeries(#2218) 2018-04-12 14:02:52 +08:00
SunChaoqun
a61f46212b TESB-21810:Module tab shows the incorrect list of installed jar files (#2213)
when using cConfig components
2018-04-11 18:02:23 +08:00
wchen-talend
f174d55f1d fix(TUP-19931):Undo does not work after deleting link between (#2189)
tELTMSSqlInput and tELTMSSQLMap
2018-04-11 10:20:08 +08:00
Anas KHABALI
b146fd0c38 (fix:tacokit) : validaiton listener lifecycle (#2207)
Fix active if when depending on a parent configuration
Fix validation label synchronization
Fix pattern validation (remove quotes from value)
2018-04-11 09:24:35 +08:00
Roman
f3858258ad fix(TDI-36516): add quotes to table name (#2194) 2018-04-10 15:10:23 +03:00
jzhao
1a349f86a2 fix(TDI-40349): tMomInput "Keep Listening" should not be hidden in some situtation.(#2204) 2018-04-10 09:01:52 +08:00
SunChaoqun
2387533abc TESB-21791:cConfig - Upload Libraries does not work (#2200) 2018-04-09 14:53:03 +08:00
zwxue
254a1a9184 workitem(TUP-19959):Wrong content for CI project settings on TOS and (#2198)
missing documentation for user
2018-04-09 10:48:12 +08:00
wang wei
00c95c6ba9 fix(TDI-40329): Constant String too long due to a large schema (#2188) 2018-04-08 10:32:39 +08:00
nrousseau
34dcc374b4 fix(TESB-21702) Fix route generation (#2196) 2018-04-06 16:56:57 +08:00
apoltavtsev
34d92b92c9 TESB-21702 Maven nature added to new child subjob (#2192) 2018-04-05 21:49:32 +02:00
zwxue
4a57c719ec fix(TUP-19945):first generate failed with error:ProcessorException: (#2190)
Routines "myroutine" has compile errors.
2018-04-04 21:57:23 +08:00
Chao MENG
29808a2f74 update junit for TalendEditorPaletteFactory (#2191) 2018-04-04 21:50:42 +08:00
Jenkins Continuous Build server
db3fbd82bd Set version to 7.1.0 SNAPSHOT 2018-04-04 14:26:08 +02:00
jzhao
6dc06c5f4c fix(TDI-40333): For tSQLDWHBulkExec, the password field is not encrypted in the generated java code(#2185) 2018-04-04 14:59:29 +08:00
Mike Yan
c21be116fb TESB-21726: NPE when publish OSGi type with TSC_BDRT license (#2186) 2018-04-04 14:31:42 +08:00
zwxue
15affaeffa fix(TUP-19941):Fix NPE during guessing schema for Tacokit component. (#2184) 2018-04-04 10:35:38 +08:00
1374 changed files with 57631 additions and 18168 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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.1.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-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.1.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]
@@ -315,7 +315,7 @@
unpack="false"/>
<plugin
id="org.talend.components.snowflake"
id="org.talend.components.snowflake.definition"
download-size="0"
install-size="0"
version="0.0.0"

View File

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

View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.talend.tos.core.feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>

View File

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

View File

@@ -0,0 +1,142 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.talend.tos.core.feature"
label="Feature"
version="7.1.1.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]
</description>
<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>
<license url="http://www.example.com/license">
[Enter License Description here.]
</license>
<includes
id="org.talend.commons.feature"
version="0.0.0"
search-location="self"/>
<includes
id="org.talend.core.feature"
version="0.0.0"
search-location="self"/>
<includes
id="org.talend.repository.feature"
version="0.0.0"
search-location="self"/>
<includes
id="org.talend.designer.feature"
version="0.0.0"
search-location="self"/>
<includes
id="org.talend.rcp.feature"
version="0.0.0"
search-location="self"/>
<includes
id="org.talend.tos.components.feature"
version="0.0.0"/>
<includes
id="org.talend.hadoop.distribution.feature"
version="0.0.0"/>
<includes
id="org.talend.updates.feature"
version="0.0.0"/>
<requires>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.talend.commons.ui"/>
<import plugin="org.talend.designer.core"/>
<import plugin="org.eclipse.xsd"/>
<import plugin="org.apache.log4j"/>
<import plugin="org.talend.repository"/>
<import plugin="org.talend.core"/>
<import plugin="org.apache.axis"/>
<import plugin="javax.xml.rpc"/>
</requires>
<plugin
id="org.talend.repository.mdm"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.xsd"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.repository.ftp"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.repository.ftp.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.repository.mdm.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.libraries.json"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.talend.repository.json"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.repository.json.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.designer.maven.job"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.transaction"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
</feature>

View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.1.1-M2</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.tos.core.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.tos.feature"
label="Tos feature"
version="7.0.1.qualifier"
version="7.1.1.qualifier"
provider-name=".Talend SA.">
<description url="http://www.example.com/description">
@@ -17,12 +17,8 @@
[Enter License Description here.]
</license>
<url>
<update label="TOS Talend update site for milestones" url="http://talendforge.org/core/updatesite/testing/"/>
</url>
<includes
id="org.talend.commons.feature"
id="org.talend.tos.core.feature"
version="0.0.0"
search-location="self"/>
@@ -31,31 +27,11 @@
version="0.0.0"
search-location="self"/>
<includes
id="org.talend.core.feature"
version="0.0.0"
search-location="self"/>
<includes
id="org.talend.repository.feature"
version="0.0.0"
search-location="self"/>
<includes
id="org.talend.designer.feature"
version="0.0.0"
search-location="self"/>
<includes
id="org.talend.designer.business.feature"
version="0.0.0"
search-location="self"/>
<includes
id="org.talend.rcp.feature"
version="0.0.0"
search-location="self"/>
<includes
id="org.talend.sbi.feature"
version="0.0.0"
@@ -66,91 +42,8 @@
version="0.0.0"
search-location="self"/>
<includes
id="org.talend.tos.components.feature"
version="0.0.0"/>
<includes
id="org.talend.hadoop.distribution.feature"
version="0.0.0"/>
<includes
id="org.talend.updates.feature"
version="0.0.0"/>
<requires>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.talend.commons.ui"/>
<import plugin="org.talend.designer.core"/>
<import plugin="org.eclipse.xsd"/>
<import plugin="org.apache.log4j"/>
<import plugin="org.talend.repository"/>
<import plugin="org.talend.core"/>
<import plugin="org.apache.axis"/>
<import plugin="javax.xml.rpc"/>
</requires>
<plugin
id="org.talend.repository.mdm"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.xsd"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.repository.ftp"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.repository.ftp.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.repository.mdm.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.libraries.json"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.talend.repository.json"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.repository.json.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.designer.maven.job"
id="org.talend.designer.tutorials"
download-size="0"
install-size="0"
version="0.0.0"
@@ -163,20 +56,5 @@
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="javax.transaction"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.designer.tutorials"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.1.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]
@@ -255,6 +255,13 @@
install-size="0"
version="0.0.0"/>
<plugin
id="org.eclipse.nebula.widgets.tablecombo"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.nebula.widgets.nattable.core"
download-size="0"

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.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.1-SNAPSHOT</version>
<version>7.1.1-M2</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.1.1.qualifier
Bundle-Localization: plugin
Require-Bundle: org.talend.core.repository,
org.eclipse.emf.codegen,

View File

@@ -660,9 +660,16 @@ if(execStat) {
try {
runTrace.openSocket(!isChildJob);
runTrace.startThreadTrace(clientHost, portTraces);
if (runTrace.isPause()) {
while (runTrace.isPause()) {
Thread.sleep(100);
}
}
} catch (java.io.IOException ioException) {
ioException.printStackTrace();
}
} catch (InterruptedException e) {
e.printStackTrace();
}
<%
}
%>

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

@@ -22,6 +22,7 @@
org.talend.core.model.utils.NodeUtil
org.talend.core.model.utils.JavaResourcesHelper
org.talend.core.model.process.ProcessUtils
org.talend.designer.runprocess.ProcessorUtilities
"
class="Header"
%>
@@ -137,7 +138,7 @@ for (INode node : process.getNodesOfType("tRESTClient")) {
}
}
boolean talendEsbJob = actAsProvider || actAsConsumer || !process.getNodesOfType("tRouteInput").isEmpty();
boolean talendEsbJob = ProcessorUtilities.isEsbJob(process.getId(), process.getVersion());
boolean talendEsbJobFactory = actAsProvider || !process.getNodesOfType("tRouteInput").isEmpty();
boolean talendStepTemplate = !process.getNodesOfType("tActionInput").isEmpty() || !process.getNodesOfType("tActionOutput").isEmpty() || !process.getNodesOfType("tJobReject").isEmpty();
@@ -209,11 +210,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-SNAPSHOT</version>
<version>7.1.1-M2</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.codegen</artifactId>

View File

@@ -595,6 +595,13 @@ public class CodeGenerator implements ICodeGenerator {
generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_END, incomingName, typeGen));
}
}
if (isTacokitProcessor(node)) {
codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_RECORDS_END, incomingName, typeGen));
codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_BEGIN, incomingName, typeGen));
codeComponent.append(generatesTreeCode(subProcess, node, ECodePart.MAIN, typeGen));
codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_END, incomingName, typeGen));
}
codeComponent.append(generatesTreeCode(subProcess, node, part, typeGen));
// if (isIterate) {
// codeComponent.append(generateComponentCode(node,
@@ -615,6 +622,11 @@ public class CodeGenerator implements ICodeGenerator {
return codeComponent;
}
private boolean isTacokitProcessor(final INode node) {
return "org.talend.sdk.component.studio.ComponentModel".equals(node.getComponent().getClass().getName())
&& !NodeUtil.getIncomingConnections(node, IConnectionCategory.DATA).isEmpty(); //has input data
}
private StringBuffer generateSeperateEndCode(NodesSubTree subProcess, INode node, String incomingName, ETypeGen typeGen)
throws CodeGeneratorException {
StringBuffer codeComponent = new StringBuffer();

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

@@ -216,6 +216,7 @@ public final class CodeGeneratorEmittersPoolFactory {
initGenericComponent(codeLanguage, jetBeans, ECodePart.PROCESS_DATA_BEGIN, genericComponent,
genericTemplates);
initGenericComponent(codeLanguage, jetBeans, ECodePart.PROCESS_DATA_END, genericComponent, genericTemplates);
initGenericComponent(codeLanguage, jetBeans, ECodePart.PROCESS_RECORDS_END, genericComponent, genericTemplates);
initGenericComponent(codeLanguage, jetBeans, ECodePart.FINALLY, genericComponent, genericTemplates);
}

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

View File

@@ -0,0 +1,202 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

View File

@@ -0,0 +1,104 @@
Json-lib with auto-expansion of properties
=============
The XML serialization is extended to handle automatic expansion of properties for arrays that contains objects.
Source file to be serialized to and from JSON
-------------
```xml
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Document DOMVersion="8.0" Self="d">
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.3-c011 66.145661, 2012/02/06-14:56:27">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""
xmlns:dc="http://purl.org/dc/elements/1.1/">
<dc:format>application/x-indesign</dc:format>
</rdf:Description>
<rdf:Description rdf:about=""
xmlns:xmp="http://ns.adobe.com/xap/1.0/">
<xmp:CreatorTool>Adobe InDesign CS6 (Macintosh)</xmp:CreatorTool>
</rdf:Description>
<rdf:Description rdf:about=""
xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
<xmpMM:InstanceID>xmp.iid:D093CC710A2068118083AFA2F0AAE3ED</xmpMM:InstanceID>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>
</Document>
```
file.xml
Original json-lib
-------
This code
```java
XMLSerializer serializer = new XMLSerializer();
serializer.setTypeHintsEnabled(false);
JSON jsonRepresentation = serializer.readFromFile( "file.xml" );
String xml = serializer.write( jsonRepresentation );
System.out.writeToReadme(xml)
```
will render:
```xml
<o DOMVersion="8.0" Self="d">
<x:xmpmeta xmptk="Adobe XMP Core 5.3-c011 66.145661, 2012/02/06-14:56:27" xmlns:x="adobe:ns:meta/">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description>
<e about="" xmlns:dc="http://purl.org/dc/elements/1.1/">
<dc:format>application/x-indesign</dc:format>
</e>
<e about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">
<xmp:CreatorTool>Adobe InDesign CS6 (Macintosh)</xmp:CreatorTool>
</e>
<e about="" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
<xmpMM:InstanceID>xmp.iid:D093CC710A2068118083AFA2F0AAE3ED</xmpMM:InstanceID>
</e>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>
</o>
```
AutoExpand
-------
This code
```java
XMLSerializer serializer = new XMLSerializer();
serializer.setTypeHintsEnabled(false);
serializer.setPerformAutoExpansion(true);
JSON jsonRepresentation = serializer.readFromFile( "file.xml" );
String xml = serializer.write( jsonRepresentation );
System.out.writeToReadme(xml)
```
will render:
```xml
<o DOMVersion="8.0" Self="d">
<x:xmpmeta xmptk="Adobe XMP Core 5.3-c011 66.145661, 2012/02/06-14:56:27" xmlns:x="adobe:ns:meta/">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description about="" xmlns:dc="http://purl.org/dc/elements/1.1/">
<dc:format>application/x-indesign</dc:format>
</rdf:Description>
<rdf:Description about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">
<xmp:CreatorTool>Adobe InDesign CS6 (Macintosh)</xmp:CreatorTool>
</rdf:Description>
<rdf:Description about="" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
<xmpMM:InstanceID>xmp.iid:D093CC710A2068118083AFA2F0AAE3ED</xmpMM:InstanceID>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>
</o>
```

View File

@@ -0,0 +1,371 @@
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<packaging>jar</packaging>
<version>2.4.1-talend</version>
<name>json-lib</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
</properties>
<url>http://json-lib.sourceforge.net</url>
<description>
Java library for transforming beans, maps, collections, java
arrays and XML to JSON.
</description>
<inceptionYear>2006</inceptionYear>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
<comments>
This product includes software developed by Douglas
Crockford (http://www.crockford.com).
</comments>
</license>
</licenses>
<organization>
<name>Json-lib</name>
<url>http://json-lib.sourceforge.net</url>
</organization>
<scm>
<connection>
git://github.com/aalmiray/Json-lib.git
</connection>
<url>git://github.com/aalmiray/Json-lib.git</url>
<developerConnection>
git@github.com:aalmiray/Json-lib.git
</developerConnection>
</scm>
<issueManagement>
<system>SourceForge</system>
<url>https://sourceforge.net/tracker/?group_id=171425</url>
</issueManagement>
<mailingLists>
<mailingList>
<name>Json-lib User List</name>
<subscribe>
http://lists.sourceforge.net/lists/listinfo/json-lib-user
</subscribe>
<unsubscribe>
http://lists.sourceforge.net/lists/listinfo/json-lib-user
</unsubscribe>
<archive>
http://sourceforge.net/mailarchive/forum.php?forum=json-lib-user
</archive>
</mailingList>
</mailingLists>
<developers>
<developer>
<name>Douglas Crockford</name>
<email>json at JSON.org</email>
<organization>JSON.org</organization>
<roles>
<role>Original source code developer</role>
</roles>
</developer>
<developer>
<name>Andres Almiray</name>
<id>aalmiray</id>
<email>aalmiray@users.sourceforge.net</email>
<timezone>-5</timezone>
<roles>
<role>Java Developer</role>
</roles>
</developer>
</developers>
<contributors>
<contributor>
<name>Matt Small</name>
<organization>WaveMaker</organization>
<roles>
<role>Contributed generics support</role>
</roles>
</contributor>
<contributor>
<name>Dan Fabulich</name>
<roles>
<role>Feedback on JDK5 and JEE features</role>
</roles>
</contributor>
<contributor>
<name>Masato Nagai</name>
<roles>
<role>Patch for XMLSerializer</role>
</roles>
</contributor>
<contributor>
<name>Gino Miceli</name>
<roles>
<role>Patch for PropertySet strategy</role>
</roles>
</contributor>
<contributor>
<name>Mino Tonga</name>
</contributor>
<contributor>
<name>Yee_Keat Phuah</name>
<roles>
<role>Patch for thread safety in JSONObject/JSONArray</role>
</roles>
</contributor>
<contributor>
<name>Oliver Zyngier</name>
</contributor>
<contributor>
<name>Marcelo Liberato</name>
</contributor>
<contributor>
<name>Mathias Herberst</name>
</contributor>
<contributor>
<name>Ales Novy</name>
<roles>
<role>Patch for performance improvements in JSONUtils</role>
<role>Patch for propagating JsonConfig to missing methods on JSONObject</role>
</roles>
</contributor>
<contributor>
<name>Peter Schubert</name>
<roles>
<role>Performance patch for JSONUtils</role>
</roles>
</contributor>
<contributor>
<name>Ian Wolfcat Atha</name>
<roles>
<role>Performance patch for JSONUtils</role>
</roles>
</contributor>
</contributors>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<version>1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.8.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>logkit</groupId>
<artifactId>logkit</artifactId>
</exclusion>
<exclusion>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>xom</groupId>
<artifactId>xom</artifactId>
<version>1.1</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>net.sf.ezmorph</groupId>
<artifactId>ezmorph</artifactId>
<version>1.0.6</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<prerequisites>
<maven>3.0.1</maven>
</prerequisites>
<build>
<defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<templateDirectory>
${basedir}/src/site
</templateDirectory>
<template>site.vm</template>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3</version>
<configuration>
<excludes>
<exclude>**/Abstract*.java</exclude>
<exclude>**/AllTests.java</exclude>
<exclude>**/*closure*</exclude>
</excludes>
<includes>
<include>**/Test*.java</include>
</includes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.1</version>
<configuration>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
<link>http://www.junit.org/junit/javadoc/</link>
<link>
http://jakarta.apache.org/commons/beanutils/commons-beanutils-1.7.0/docs/api/
</link>
<link>
http://jakarta.apache.org/commons/lang/api-2.2/
</link>
<link>http://ezmorph.sourceforge.net/apidocs/</link>
</links>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>changes-maven-plugin</artifactId>
<reportSets>
<reportSet>
<reports>
<report>changes-report</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javancss-maven-plugin</artifactId>
<version>2.0-beta-1</version>
</plugin>
</plugins>
</reporting>
<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>
</project>

View File

@@ -0,0 +1,336 @@
/*
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.sf.json;
import java.io.IOException;
import java.io.Writer;
import java.lang.ref.SoftReference;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.util.TreeSet;
import net.sf.json.util.JSONUtils;
import net.sf.json.util.JsonEventListener;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* Base class for JSONObject and JSONArray.
*
* @author Andres Almiray <aalmiray@users.sourceforge.net>
*/
abstract class AbstractJSON implements JSON {
private static class CycleSet extends ThreadLocal {
protected Object initialValue() {
return new SoftReference(new HashSet());
}
public Set getSet() {
Set set = (Set) ((SoftReference)get()).get();
if( set == null ) {
set = new HashSet();
set(new SoftReference(set));
}
return set;
}
}
private static CycleSet cycleSet = new CycleSet();
private static final Log log = LogFactory.getLog( AbstractJSON.class );
/**
* Adds a reference for cycle detection check.
*
* @param instance the reference to add
* @return true if the instance has not been added previously, false
* otherwise.
*/
protected static boolean addInstance( Object instance ) {
return getCycleSet().add( instance );
}
/**
* Fires an end of array event.
*/
protected static void fireArrayEndEvent( JsonConfig jsonConfig ) {
if( jsonConfig.isEventTriggeringEnabled() ){
for( Iterator listeners = jsonConfig.getJsonEventListeners()
.iterator(); listeners.hasNext(); ){
JsonEventListener listener = (JsonEventListener) listeners.next();
try{
listener.onArrayEnd();
}catch( RuntimeException e ){
log.warn( e );
}
}
}
}
/**
* Fires a start of array event.
*/
protected static void fireArrayStartEvent( JsonConfig jsonConfig ) {
if( jsonConfig.isEventTriggeringEnabled() ){
for( Iterator listeners = jsonConfig.getJsonEventListeners()
.iterator(); listeners.hasNext(); ){
JsonEventListener listener = (JsonEventListener) listeners.next();
try{
listener.onArrayStart();
}catch( RuntimeException e ){
log.warn( e );
}
}
}
}
/**
* Fires an element added event.
*
* @param index the index where the element was added
* @param element the added element
*/
protected static void fireElementAddedEvent( int index, Object element, JsonConfig jsonConfig ) {
if( jsonConfig.isEventTriggeringEnabled() ){
for( Iterator listeners = jsonConfig.getJsonEventListeners()
.iterator(); listeners.hasNext(); ){
JsonEventListener listener = (JsonEventListener) listeners.next();
try{
listener.onElementAdded( index, element );
}catch( RuntimeException e ){
log.warn( e );
}
}
}
}
/**
* Fires an error event.
*
* @param jsone the thrown exception
*/
protected static void fireErrorEvent( JSONException jsone, JsonConfig jsonConfig ) {
if( jsonConfig.isEventTriggeringEnabled() ){
for( Iterator listeners = jsonConfig.getJsonEventListeners()
.iterator(); listeners.hasNext(); ){
JsonEventListener listener = (JsonEventListener) listeners.next();
try{
listener.onError( jsone );
}catch( RuntimeException e ){
log.warn( e );
}
}
}
}
/**
* Fires an end of object event.
*/
protected static void fireObjectEndEvent( JsonConfig jsonConfig ) {
if( jsonConfig.isEventTriggeringEnabled() ){
for( Iterator listeners = jsonConfig.getJsonEventListeners()
.iterator(); listeners.hasNext(); ){
JsonEventListener listener = (JsonEventListener) listeners.next();
try{
listener.onObjectEnd();
}catch( RuntimeException e ){
log.warn( e );
}
}
}
}
/**
* Fires a start of object event.
*/
protected static void fireObjectStartEvent( JsonConfig jsonConfig ) {
if( jsonConfig.isEventTriggeringEnabled() ){
for( Iterator listeners = jsonConfig.getJsonEventListeners()
.iterator(); listeners.hasNext(); ){
JsonEventListener listener = (JsonEventListener) listeners.next();
try{
listener.onObjectStart();
}catch( RuntimeException e ){
log.warn( e );
}
}
}
}
/**
* Fires a property set event.
*
* @param key the name of the property
* @param value the value of the property
* @param accumulated if the value has been accumulated over 'key'
*/
protected static void firePropertySetEvent( String key, Object value, boolean accumulated,
JsonConfig jsonConfig ) {
if( jsonConfig.isEventTriggeringEnabled() ){
for( Iterator listeners = jsonConfig.getJsonEventListeners()
.iterator(); listeners.hasNext(); ){
JsonEventListener listener = (JsonEventListener) listeners.next();
try{
listener.onPropertySet( key, value, accumulated );
}catch( RuntimeException e ){
log.warn( e );
}
}
}
}
/**
* Fires a warning event.
*
* @param warning the warning message
*/
protected static void fireWarnEvent( String warning, JsonConfig jsonConfig ) {
if( jsonConfig.isEventTriggeringEnabled() ){
for( Iterator listeners = jsonConfig.getJsonEventListeners()
.iterator(); listeners.hasNext(); ){
JsonEventListener listener = (JsonEventListener) listeners.next();
try{
listener.onWarning( warning );
}catch( RuntimeException e ){
log.warn( e );
}
}
}
}
/**
* Removes a reference for cycle detection check.
*/
protected static void removeInstance( Object instance ) {
Set set = getCycleSet();
set.remove( instance );
if(set.size() == 0) {
cycleSet.remove();
}
}
protected Object _processValue( Object value, JsonConfig jsonConfig ) {
if( JSONNull.getInstance().equals( value ) ) {
return JSONNull.getInstance();
} else if( Class.class.isAssignableFrom( value.getClass() ) || value instanceof Class ) {
return ((Class) value).getName();
} else if( JSONUtils.isFunction( value ) ) {
if( value instanceof String ) {
value = JSONFunction.parse( (String) value );
}
return value;
} else if( value instanceof JSONString ) {
return JSONSerializer.toJSON( (JSONString) value, jsonConfig );
} else if( value instanceof JSON ) {
return JSONSerializer.toJSON( value, jsonConfig );
} else if( JSONUtils.isArray( value ) ) {
return JSONArray.fromObject( value, jsonConfig );
} else if( JSONUtils.isString( value ) ) {
String str = String.valueOf( value );
if( JSONUtils.hasQuotes( str ) ){
String stripped = JSONUtils.stripQuotes( str );
if( JSONUtils.isFunction( stripped )){
return JSONUtils.DOUBLE_QUOTE + stripped + JSONUtils.DOUBLE_QUOTE;
}
if(stripped.startsWith("[") && stripped.endsWith("]")) {
return stripped;
}
if(stripped.startsWith("{") && stripped.endsWith("}")) {
return stripped;
}
return str;
} else if( JSONUtils.isJsonKeyword( str, jsonConfig ) ) {
if( jsonConfig.isJavascriptCompliant() && "undefined".equals( str )){
return JSONNull.getInstance();
}
return str;
} else if( JSONUtils.mayBeJSON( str ) ) {
try {
return JSONSerializer.toJSON( str, jsonConfig );
} catch( JSONException jsone ) {
return str;
}
}
return str;
} else if( JSONUtils.isNumber( value ) ) {
JSONUtils.testValidity( value );
return JSONUtils.transformNumber( (Number) value );
} else if( JSONUtils.isBoolean( value ) ) {
return value;
} else {
JSONObject jsonObject = JSONObject.fromObject( value, jsonConfig );
if( jsonObject.isNullObject() ) {
return JSONNull.getInstance();
} else {
return jsonObject;
}
}
}
private static Set getCycleSet() {
return cycleSet.getSet();
}
public final Writer write(Writer writer) throws IOException {
write(writer,NORMAL);
return writer;
}
public final Writer writeCanonical(Writer writer) throws IOException {
write(writer,CANONICAL);
return writer;
}
protected abstract void write(Writer w, WritingVisitor v) throws IOException;
interface WritingVisitor {
Collection keySet(JSONObject o);
void on(JSON o, Writer w) throws IOException;
void on(Object value, Writer w) throws IOException;
}
private static final WritingVisitor NORMAL = new WritingVisitor() {
public Collection keySet(JSONObject o) {
return o.keySet();
}
public void on(JSON o, Writer w) throws IOException {
o.write(w);
}
public void on(Object value, Writer w) throws IOException {
w.write(JSONUtils.valueToString(value));
}
};
private static final WritingVisitor CANONICAL = new WritingVisitor() {
public Collection keySet(JSONObject o) {
return new TreeSet(o.keySet()); // sort them alphabetically
}
public void on(JSON o, Writer w) throws IOException {
o.writeCanonical(w);
}
public void on(Object value, Writer w) throws IOException {
w.write(JSONUtils.valueToCanonicalString(value));
}
};
}

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