Compare commits
9 Commits
codegen_ba
...
patch/TPS-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8d4e1bf57c | ||
|
|
2054c1a17f | ||
|
|
fca64405a2 | ||
|
|
9c31c2869d | ||
|
|
e91f8c1b5d | ||
|
|
6d16ec2e3e | ||
|
|
d5dfa732da | ||
|
|
49d093c671 | ||
|
|
0f3b302525 |
77
PATCH_RELEASE_NOTE.md
Normal file
77
PATCH_RELEASE_NOTE.md
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
---
|
||||||
|
version: 7.2.1
|
||||||
|
module: https://talend.poolparty.biz/coretaxonomy/42
|
||||||
|
product:
|
||||||
|
- https://talend.poolparty.biz/coretaxonomy/23
|
||||||
|
---
|
||||||
|
|
||||||
|
# TPS-3379
|
||||||
|
|
||||||
|
| Info | Value |
|
||||||
|
| ---------------- | ---------------- |
|
||||||
|
| Patch Name | Patch\_20190917_TPS-3379\_v1-7.2.1 |
|
||||||
|
| Release Date | 2019-09-17 |
|
||||||
|
| Target Version | 20190620\_1446-V7.2.1 |
|
||||||
|
| Product affected | Talend Studio |
|
||||||
|
|
||||||
|
## Introduction
|
||||||
|
|
||||||
|
This is a self-contained patch.
|
||||||
|
|
||||||
|
**NOTE**: For information on how to obtain this patch, reach out to your Support contact at Talend.
|
||||||
|
|
||||||
|
## Fixed issues
|
||||||
|
|
||||||
|
This patch contains the following fixes:
|
||||||
|
|
||||||
|
- TPS-3379 [7.2.1]tWriteJsonField does not handle null values consistently(TDI-37801)
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
|
||||||
|
Consider the following requirements for your system:
|
||||||
|
|
||||||
|
- Talend Studio 7.2.1 must be installed.
|
||||||
|
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
### Installing the patch using Software update
|
||||||
|
|
||||||
|
1) Logon TAC and switch to Configuration->Software Update, then enter the correct values and save referring to the documentation: https://help.talend.com/reader/f7Em9WV_cPm2RRywucSN0Q/j9x5iXV~vyxMlUafnDejaQ
|
||||||
|
|
||||||
|
2) Switch to Software update page, where the new patch will be listed. The patch can be downloaded from here into the nexus repository.
|
||||||
|
|
||||||
|
3) On Studio Side: Logon Studio with remote mode, on the logon page the Update button is displayed: click this button to install the patch.
|
||||||
|
|
||||||
|
### Installing the patch using Talend Studio
|
||||||
|
|
||||||
|
1) Create a folder named "patches" under your studio installer directory and copy the patch .zip file to this folder.
|
||||||
|
|
||||||
|
2) Restart your studio: a window pops up, then click OK to install the patch, or restart the commandline and the patch will be installed automatically.
|
||||||
|
|
||||||
|
### Installing the patch using Commandline
|
||||||
|
|
||||||
|
Execute the following commands:
|
||||||
|
|
||||||
|
1. Talend-Studio-win-x86_64.exe -nosplash -application org.talend.commandline.CommandLine -consoleLog -data commandline-workspace startServer -p 8002 --talendDebug
|
||||||
|
2. initRemote {tac_url} -ul {TAC login username} -up {TAC login password}
|
||||||
|
3. checkAndUpdate -tu {TAC login username} -tup {TAC login password}
|
||||||
|
|
||||||
|
## Uninstallation
|
||||||
|
Backup the Affected files list below. Uninstall the patch by restore the backup files.
|
||||||
|
|
||||||
|
## Affected files for this patch
|
||||||
|
|
||||||
|
The following files are installed by this patch:
|
||||||
|
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_7.2.1.20190614\_0309/components/tExtractJSONFields/tExtractJSONFields\_java.xml
|
||||||
|
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_7.2.1.20190614\_0309/components/tFileInputJSON/tFileInputJSON\_java.xml
|
||||||
|
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_7.2.1.20190614\_0309/components/tWriteJSONField/tWriteJSONField\_java.xml
|
||||||
|
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_7.2.1.20190614\_0309/components/tWriteJSONField/tWriteJSONField\_messages.properties
|
||||||
|
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_7.2.1.20190614\_0309/components/tWriteJSONFieldIn/tWriteJSONFieldIn\_begin.javajet
|
||||||
|
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_7.2.1.20190614\_0309/components/tWriteJSONFieldIn/tWriteJSONFieldIn\_java.xml
|
||||||
|
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_7.2.1.20190614\_0309/components/tWriteXMLFieldOut/tWriteXMLFieldOut\_java.xml
|
||||||
|
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_7.2.1.20190614\_0309/components/tWriteXMLFieldOut/tWriteXMLFieldOut\_main.javajet
|
||||||
|
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.bigdata\_7.2.1.20190619\_1114/components/tCosmosDBWriteConf/tCosmosDBWriteConf\_java.xml
|
||||||
|
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.bigdata\_7.2.1.20190619\_1114/components/tMongoDBWriteConf/tMongoDBWriteConf\_java.xml
|
||||||
|
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.tisprovider\_7.2.1.20190614\_0242/components/tDataprepOut/tDataprepOut\_java.xml
|
||||||
|
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.abstractmap.nl</artifactId>
|
<artifactId>org.talend.designer.abstractmap.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.alfrescooutput.nl</artifactId>
|
<artifactId>org.talend.designer.alfrescooutput.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.business.diagram.nl</artifactId>
|
<artifactId>org.talend.designer.business.diagram.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.codegen.nl</artifactId>
|
<artifactId>org.talend.designer.codegen.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.components.exchange.nl</artifactId>
|
<artifactId>org.talend.designer.components.exchange.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.core.nl</artifactId>
|
<artifactId>org.talend.designer.core.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.dbmap.nl</artifactId>
|
<artifactId>org.talend.designer.dbmap.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.documentation.nl</artifactId>
|
<artifactId>org.talend.designer.documentation.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.fileoutputxml.nl</artifactId>
|
<artifactId>org.talend.designer.fileoutputxml.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.gefabstractmap.nl</artifactId>
|
<artifactId>org.talend.designer.gefabstractmap.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.mapper.nl</artifactId>
|
<artifactId>org.talend.designer.mapper.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.maven.job.nl</artifactId>
|
<artifactId>org.talend.designer.maven.job.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.rowgenerator.nl</artifactId>
|
<artifactId>org.talend.designer.rowgenerator.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.runprocess.nl</artifactId>
|
<artifactId>org.talend.designer.runprocess.nl</artifactId>
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ ProcessDebugDialog.errortext=Impossible de d\u00E9bugger le job.\\nV\u00E9rifiez
|
|||||||
ShadowProcess.notGeneratedOutputException=Sortie non g\u00E9n\u00E9r\u00E9e.
|
ShadowProcess.notGeneratedOutputException=Sortie non g\u00E9n\u00E9r\u00E9e.
|
||||||
ProcessComposite.contextGroup=Contexte
|
ProcessComposite.contextGroup=Contexte
|
||||||
prefs.clientConfiguration=Configuration du client Talend
|
prefs.clientConfiguration=Configuration du client Talend
|
||||||
ProcessComposite.endPattern=Le Job {0} s\'est termin\u00E9 \u00E0 {1,date,HH:mm dd/MM/yyyy}. [code de sortie={2,number}]
|
ProcessComposite.endPattern=Le Job {0} s'est termin\u00E9 \u00E0 {1,date,HH:mm dd/MM/yyyy}. [code de sortie={2,number}]
|
||||||
ProcessView.title=Ex\u00E9cuter({0})
|
ProcessView.title=Ex\u00E9cuter({0})
|
||||||
Processor.configurePerl=L'interpr\u00E9teur Perl n'est pas configur\u00E9.
|
Processor.configurePerl=L'interpr\u00E9teur Perl n'est pas configur\u00E9.
|
||||||
JavaProcessor.notFoundedFolderException=Dossier introuvable dans le projet .Java
|
JavaProcessor.notFoundedFolderException=Dossier introuvable dans le projet .Java
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.scd.nl</artifactId>
|
<artifactId>org.talend.designer.scd.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.webservice.nl</artifactId>
|
<artifactId>org.talend.designer.webservice.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.xmlmap.nl</artifactId>
|
<artifactId>org.talend.designer.xmlmap.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.expressionbuilder.nl</artifactId>
|
<artifactId>org.talend.expressionbuilder.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>
|
<artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>
|
<artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.repository.ftp.nl</artifactId>
|
<artifactId>org.talend.repository.ftp.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.repository.json.nl</artifactId>
|
<artifactId>org.talend.repository.json.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.repository.nl</artifactId>
|
<artifactId>org.talend.repository.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.repository.view.di.nl</artifactId>
|
<artifactId>org.talend.repository.view.di.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.sbi.engines.client.nl</artifactId>
|
<artifactId>org.talend.sbi.engines.client.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.spagic.engines.client.nl</artifactId>
|
<artifactId>org.talend.spagic.engines.client.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.sqlbuilder.nl</artifactId>
|
<artifactId>org.talend.sqlbuilder.nl</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.business.feature</artifactId>
|
<artifactId>org.talend.designer.business.feature</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.feature</artifactId>
|
<artifactId>org.talend.designer.feature</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.fragment.jars.di.feature</artifactId>
|
<artifactId>org.talend.fragment.jars.di.feature</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.rcp.branding.tos.feature</artifactId>
|
<artifactId>org.talend.rcp.branding.tos.feature</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>
|
<artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.repository.feature</artifactId>
|
<artifactId>org.talend.repository.feature</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.sbi.feature</artifactId>
|
<artifactId>org.talend.sbi.feature</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.spagic.feature</artifactId>
|
<artifactId>org.talend.spagic.feature</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.tos.components.feature</artifactId>
|
<artifactId>org.talend.tos.components.feature</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.tos.core.feature</artifactId>
|
<artifactId>org.talend.tos.core.feature</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.tos.feature</artifactId>
|
<artifactId>org.talend.tos.feature</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.tos.libraries.feature</artifactId>
|
<artifactId>org.talend.tos.libraries.feature</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.abstractmap</artifactId>
|
<artifactId>org.talend.designer.abstractmap</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.alfrescooutput</artifactId>
|
<artifactId>org.talend.designer.alfrescooutput</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.business.diagram</artifactId>
|
<artifactId>org.talend.designer.business.diagram</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.codegen</artifactId>
|
<artifactId>org.talend.designer.codegen</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.components.exchange</artifactId>
|
<artifactId>org.talend.designer.components.exchange</artifactId>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
<groupId>net.sf.json-lib</groupId>
|
<groupId>net.sf.json-lib</groupId>
|
||||||
<artifactId>json-lib</artifactId>
|
<artifactId>json-lib</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<version>2.4.1-talend</version>
|
<version>2.4.3-talend</version>
|
||||||
<name>json-lib</name>
|
<name>json-lib</name>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
|||||||
@@ -163,6 +163,11 @@ public class XMLSerializer {
|
|||||||
*/
|
*/
|
||||||
private boolean useLongDecimals;
|
private boolean useLongDecimals;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* flag for if parse empty elements as empty strings
|
||||||
|
*/
|
||||||
|
private boolean useEmptyStrings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new XMLSerializer with default options.<br>
|
* Creates a new XMLSerializer with default options.<br>
|
||||||
* <ul>
|
* <ul>
|
||||||
@@ -803,6 +808,8 @@ public class XMLSerializer {
|
|||||||
clazz = JSONTypes.OBJECT;
|
clazz = JSONTypes.OBJECT;
|
||||||
}else if( JSONTypes.ARRAY.compareToIgnoreCase( clazzText ) == 0 ){
|
}else if( JSONTypes.ARRAY.compareToIgnoreCase( clazzText ) == 0 ){
|
||||||
clazz = JSONTypes.ARRAY;
|
clazz = JSONTypes.ARRAY;
|
||||||
|
} else if(JSONTypes.STRING.equalsIgnoreCase(clazzText)) {
|
||||||
|
clazz = JSONTypes.STRING;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return clazz;
|
return clazz;
|
||||||
@@ -1414,6 +1421,8 @@ public class XMLSerializer {
|
|||||||
String text = element.getValue();
|
String text = element.getValue();
|
||||||
params = StringUtils.split( paramsAttribute.getValue(), "," );
|
params = StringUtils.split( paramsAttribute.getValue(), "," );
|
||||||
setOrAccumulate( jsonObject, key, new JSONFunction( params, text ) );
|
setOrAccumulate( jsonObject, key, new JSONFunction( params, text ) );
|
||||||
|
} else if( useEmptyStrings && clazz != null && clazz.equalsIgnoreCase(JSONTypes.STRING) ) {
|
||||||
|
setTextValue(jsonObject, key, element);
|
||||||
}else{
|
}else{
|
||||||
if( isArray( element, false ) ){
|
if( isArray( element, false ) ){
|
||||||
setOrAccumulate( jsonObject, key, processArrayElement( element, defaultType ) );
|
setOrAccumulate( jsonObject, key, processArrayElement( element, defaultType ) );
|
||||||
@@ -1421,6 +1430,14 @@ public class XMLSerializer {
|
|||||||
setOrAccumulate( jsonObject, key, simplifyValue( jsonObject,
|
setOrAccumulate( jsonObject, key, simplifyValue( jsonObject,
|
||||||
processObjectElement( element, defaultType ) ) );
|
processObjectElement( element, defaultType ) ) );
|
||||||
}else{
|
}else{
|
||||||
|
setTextValue(jsonObject, key, element);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setTextValue(final JSONObject jsonObject, final String key, final Element element) {
|
||||||
String value;
|
String value;
|
||||||
if( isKeepCData && isCData( element ) ){
|
if( isKeepCData && isCData( element ) ){
|
||||||
value = "<![CDATA[" + element.getValue() + "]]>";
|
value = "<![CDATA[" + element.getValue() + "]]>";
|
||||||
@@ -1429,10 +1446,6 @@ public class XMLSerializer {
|
|||||||
}
|
}
|
||||||
setOrAccumulate( jsonObject, key, trimSpaceFromValue( value ) );
|
setOrAccumulate( jsonObject, key, trimSpaceFromValue( value ) );
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isCData( Element element ) {
|
private boolean isCData( Element element ) {
|
||||||
if( element.getChildCount() == 1 ){
|
if( element.getChildCount() == 1 ){
|
||||||
@@ -1493,6 +1506,14 @@ public class XMLSerializer {
|
|||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setUseEmptyStrings(boolean useEmptyStrings) {
|
||||||
|
this.useEmptyStrings = useEmptyStrings;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isUseEmptyStrings() {
|
||||||
|
return this.useEmptyStrings;
|
||||||
|
}
|
||||||
|
|
||||||
private static class CustomElement extends Element {
|
private static class CustomElement extends Element {
|
||||||
private static String getName( String name ) {
|
private static String getName( String name ) {
|
||||||
int colon = name.indexOf( ':' );
|
int colon = name.indexOf( ':' );
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.components.libs</artifactId>
|
<artifactId>org.talend.designer.components.libs</artifactId>
|
||||||
|
|||||||
@@ -178,7 +178,7 @@
|
|||||||
<IMPORTS>
|
<IMPORTS>
|
||||||
<IMPORT NAME="Java_DOM4J1.6" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1" UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
|
<IMPORT NAME="Java_DOM4J1.6" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1" UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
|
||||||
<IMPORT NAME="Java_JAXEN1.1" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
|
<IMPORT NAME="Java_JAXEN1.1" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
|
||||||
<IMPORT NAME="json-lib" MODULE="json-lib-2.4.1-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.1-talend" REQUIRED_IF="READ_BY == 'XPATH'" />
|
<IMPORT NAME="json-lib" MODULE="json-lib-2.4.3-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.3-talend" REQUIRED_IF="READ_BY == 'XPATH'" />
|
||||||
<IMPORT NAME="commons_lang" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
|
<IMPORT NAME="commons_lang" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
|
||||||
<IMPORT NAME="commons_logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0" UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
|
<IMPORT NAME="commons_logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0" UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
|
||||||
<IMPORT NAME="ezmorph" MODULE="ezmorph-1.0.6.jar" MVN="mvn:org.talend.libraries/ezmorph-1.0.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.jackson/lib/ezmorph-1.0.6.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
|
<IMPORT NAME="ezmorph" MODULE="ezmorph-1.0.6.jar" MVN="mvn:org.talend.libraries/ezmorph-1.0.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.jackson/lib/ezmorph-1.0.6.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
|
||||||
|
|||||||
@@ -165,7 +165,7 @@
|
|||||||
REQUIRED_IF="(READ_BY == 'XPATH')" BundleID="" />
|
REQUIRED_IF="(READ_BY == 'XPATH')" BundleID="" />
|
||||||
<IMPORT NAME="Java_JAXEN1.1" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar"
|
<IMPORT NAME="Java_JAXEN1.1" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar"
|
||||||
REQUIRED_IF="(READ_BY == 'XPATH')" BundleID="" />
|
REQUIRED_IF="(READ_BY == 'XPATH')" BundleID="" />
|
||||||
<IMPORT NAME="json-lib" MODULE="json-lib-2.4.1-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.1-talend" REQUIRED_IF="(READ_BY == 'XPATH')" />
|
<IMPORT NAME="json-lib" MODULE="json-lib-2.4.3-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.3-talend" REQUIRED_IF="(READ_BY == 'XPATH')" />
|
||||||
<IMPORT NAME="commons_lang" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar"
|
<IMPORT NAME="commons_lang" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar"
|
||||||
REQUIRED_IF="(READ_BY == 'XPATH')" />
|
REQUIRED_IF="(READ_BY == 'XPATH')" />
|
||||||
<IMPORT NAME="commons_logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0" UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar"
|
<IMPORT NAME="commons_logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0" UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar"
|
||||||
|
|||||||
@@ -98,6 +98,10 @@
|
|||||||
<PARAMETER NAME="QUOTE_ALL_VALUES" FIELD="CHECK" REQUIRED="true" NUM_ROW="20">
|
<PARAMETER NAME="QUOTE_ALL_VALUES" FIELD="CHECK" REQUIRED="true" NUM_ROW="20">
|
||||||
<DEFAULT>false</DEFAULT>
|
<DEFAULT>false</DEFAULT>
|
||||||
</PARAMETER>
|
</PARAMETER>
|
||||||
|
<PARAMETER NAME="ALLOW_EMPTY_STRINGS" FIELD="CHECK" NUM_ROW="21"
|
||||||
|
REQUIRED="false">
|
||||||
|
<DEFAULT>false</DEFAULT>
|
||||||
|
</PARAMETER>
|
||||||
</ADVANCED_PARAMETERS>
|
</ADVANCED_PARAMETERS>
|
||||||
|
|
||||||
<CODEGENERATION>
|
<CODEGENERATION>
|
||||||
@@ -124,6 +128,8 @@
|
|||||||
<TEMPLATE_PARAM SOURCE="self.REMOVE_ROOT" TARGET="In.REMOVE_ROOT" />
|
<TEMPLATE_PARAM SOURCE="self.REMOVE_ROOT" TARGET="In.REMOVE_ROOT" />
|
||||||
<TEMPLATE_PARAM SOURCE="self.UNIQUE_NAME" TARGET="In.DESTINATION" />
|
<TEMPLATE_PARAM SOURCE="self.UNIQUE_NAME" TARGET="In.DESTINATION" />
|
||||||
<TEMPLATE_PARAM SOURCE="self.UNIQUE_NAME" TARGET="Out.DESTINATION" />
|
<TEMPLATE_PARAM SOURCE="self.UNIQUE_NAME" TARGET="Out.DESTINATION" />
|
||||||
|
<TEMPLATE_PARAM SOURCE="self.ALLOW_EMPTY_STRINGS" TARGET="Out.ALLOW_EMPTY_STRINGS" />
|
||||||
|
<TEMPLATE_PARAM SOURCE="self.ALLOW_EMPTY_STRINGS" TARGET="In.ALLOW_EMPTY_STRINGS" />
|
||||||
|
|
||||||
</TEMPLATES>
|
</TEMPLATES>
|
||||||
</CODEGENERATION>
|
</CODEGENERATION>
|
||||||
|
|||||||
@@ -30,3 +30,4 @@ JSONFIELD.NAME=Output Column
|
|||||||
COMPACT_FORMAT.NAME = Compact Format
|
COMPACT_FORMAT.NAME = Compact Format
|
||||||
REMOVE_ROOT.NAME=Remove root node.
|
REMOVE_ROOT.NAME=Remove root node.
|
||||||
QUOTE_ALL_VALUES.NAME=Quote all values
|
QUOTE_ALL_VALUES.NAME=Quote all values
|
||||||
|
ALLOW_EMPTY_STRINGS.NAME=Pass null values and empty strings explicitly
|
||||||
@@ -16,6 +16,7 @@ imports="
|
|||||||
CodeGeneratorArgument codeGenArgument = (CodeGeneratorArgument) argument;
|
CodeGeneratorArgument codeGenArgument = (CodeGeneratorArgument) argument;
|
||||||
INode node = (INode)codeGenArgument.getArgument();
|
INode node = (INode)codeGenArgument.getArgument();
|
||||||
String cid = node.getUniqueName();
|
String cid = node.getUniqueName();
|
||||||
|
final boolean allowEmptyStrings = ("true").equals(ElementParameterParser.getValue(node, "__ALLOW_EMPTY_STRINGS__"));
|
||||||
|
|
||||||
List<IMetadataTable> metadatas = node.getMetadataList();
|
List<IMetadataTable> metadatas = node.getMetadataList();
|
||||||
if ((metadatas!=null)&&(metadatas.size()>0)) {
|
if ((metadatas!=null)&&(metadatas.size()>0)) {
|
||||||
@@ -33,6 +34,7 @@ if ((metadatas!=null)&&(metadatas.size()>0)) {
|
|||||||
xmlSerializer_<%=cid%>.clearNamespaces();
|
xmlSerializer_<%=cid%>.clearNamespaces();
|
||||||
xmlSerializer_<%=cid%>.setSkipNamespaces(true);
|
xmlSerializer_<%=cid%>.setSkipNamespaces(true);
|
||||||
xmlSerializer_<%=cid%>.setForceTopLevelObject(<%=(removeRoot?false:true)%>);
|
xmlSerializer_<%=cid%>.setForceTopLevelObject(<%=(removeRoot?false:true)%>);
|
||||||
|
xmlSerializer_<%=cid%>.setUseEmptyStrings(<%=allowEmptyStrings%>);
|
||||||
<%
|
<%
|
||||||
INode sourceNode = node.getIncomingConnections(EConnectionType.ON_COMPONENT_OK).get(0).getSource();
|
INode sourceNode = node.getIncomingConnections(EConnectionType.ON_COMPONENT_OK).get(0).getSource();
|
||||||
String virtualSourceCid = sourceNode.getUniqueName();
|
String virtualSourceCid = sourceNode.getUniqueName();
|
||||||
|
|||||||
@@ -60,6 +60,13 @@
|
|||||||
</PARAMETER>
|
</PARAMETER>
|
||||||
</PARAMETERS>
|
</PARAMETERS>
|
||||||
|
|
||||||
|
<ADVANCED_PARAMETERS>
|
||||||
|
<PARAMETER NAME="ALLOW_EMPTY_STRINGS" FIELD="CHECK" NUM_ROW="21"
|
||||||
|
REQUIRED="false">
|
||||||
|
<DEFAULT>false</DEFAULT>
|
||||||
|
</PARAMETER>
|
||||||
|
</ADVANCED_PARAMETERS>
|
||||||
|
|
||||||
<CODEGENERATION>
|
<CODEGENERATION>
|
||||||
<IMPORTS>
|
<IMPORTS>
|
||||||
<IMPORT NAME="xom" MODULE="xom-1.2.7.jar" MVN="mvn:org.talend.libraries/xom-1.2.7/6.0.0" REQUIRED="true" />
|
<IMPORT NAME="xom" MODULE="xom-1.2.7.jar" MVN="mvn:org.talend.libraries/xom-1.2.7/6.0.0" REQUIRED="true" />
|
||||||
@@ -68,7 +75,7 @@
|
|||||||
<IMPORT NAME="commons_lang" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" REQUIRED="true" />
|
<IMPORT NAME="commons_lang" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" REQUIRED="true" />
|
||||||
<IMPORT NAME="commons_logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0" UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED="true" />
|
<IMPORT NAME="commons_logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0" UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED="true" />
|
||||||
<IMPORT NAME="ezmorph" MODULE="ezmorph-1.0.6.jar" MVN="mvn:org.talend.libraries/ezmorph-1.0.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.jackson/lib/ezmorph-1.0.6.jar" REQUIRED="true" />
|
<IMPORT NAME="ezmorph" MODULE="ezmorph-1.0.6.jar" MVN="mvn:org.talend.libraries/ezmorph-1.0.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.jackson/lib/ezmorph-1.0.6.jar" REQUIRED="true" />
|
||||||
<IMPORT NAME="json-lib" MODULE="json-lib-2.4.1-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.1-talend" REQUIRED="true" />
|
<IMPORT NAME="json-lib" MODULE="json-lib-2.4.3-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.3-talend" REQUIRED="true" />
|
||||||
</IMPORTS>
|
</IMPORTS>
|
||||||
</CODEGENERATION>
|
</CODEGENERATION>
|
||||||
|
|
||||||
|
|||||||
@@ -104,6 +104,11 @@
|
|||||||
<DEFAULT>false</DEFAULT>
|
<DEFAULT>false</DEFAULT>
|
||||||
</PARAMETER>
|
</PARAMETER>
|
||||||
|
|
||||||
|
<PARAMETER NAME="ALLOW_EMPTY_STRINGS" FIELD="CHECK" NUM_ROW="12"
|
||||||
|
REQUIRED="false">
|
||||||
|
<DEFAULT>false</DEFAULT>
|
||||||
|
</PARAMETER>
|
||||||
|
|
||||||
<PARAMETER NAME="OUTPUT_AS_XSD" FIELD="CHECK"
|
<PARAMETER NAME="OUTPUT_AS_XSD" FIELD="CHECK"
|
||||||
REQUIRED="false" NUM_ROW="15">
|
REQUIRED="false" NUM_ROW="15">
|
||||||
<DEFAULT>false</DEFAULT>
|
<DEFAULT>false</DEFAULT>
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ String destination4JSON = ElementParameterParser.getValue(node, "__DESTINATION__
|
|||||||
boolean istWriteJSONField = destination4JSON == null ? false : destination4JSON.contains("tWriteJSONField_");
|
boolean istWriteJSONField = destination4JSON == null ? false : destination4JSON.contains("tWriteJSONField_");
|
||||||
boolean isQuoteAllValues = ("true").equals(ElementParameterParser.getValue(node, "__QUOTE_ALL_VALUES__"));
|
boolean isQuoteAllValues = ("true").equals(ElementParameterParser.getValue(node, "__QUOTE_ALL_VALUES__"));
|
||||||
boolean isCompactFormat = ("true").equals(ElementParameterParser.getValue(node, "__COMPACT_FORMAT__"));
|
boolean isCompactFormat = ("true").equals(ElementParameterParser.getValue(node, "__COMPACT_FORMAT__"));
|
||||||
|
final boolean allowEmptyStrings = ("true").equals(ElementParameterParser.getValue(node, "__ALLOW_EMPTY_STRINGS__"));
|
||||||
final String whiteSpace;
|
final String whiteSpace;
|
||||||
final String rowSeparator;
|
final String rowSeparator;
|
||||||
if(!isCompactFormat) { // pretty format
|
if(!isCompactFormat) { // pretty format
|
||||||
@@ -262,6 +263,14 @@ class GenerateToolByDom4j{
|
|||||||
if(<%tool.getValue(node);%>!=null){
|
if(<%tool.getValue(node);%>!=null){
|
||||||
nestXMLTool_<%=cid%> .setText(<%=currEleName%>_<%=cid%>,<%tool.getValue(node);%>);
|
nestXMLTool_<%=cid%> .setText(<%=currEleName%>_<%=cid%>,<%tool.getValue(node);%>);
|
||||||
<%
|
<%
|
||||||
|
if(istWriteJSONField && allowEmptyStrings) {
|
||||||
|
if (javaType == JavaTypesManager.STRING) {
|
||||||
|
%>
|
||||||
|
<%=currEleName%>_<%=cid%>.addAttribute("type", "string");
|
||||||
|
<%=currEleName%>_<%=cid%>.addAttribute("class", "string");
|
||||||
|
<%
|
||||||
|
}
|
||||||
|
}
|
||||||
boolean hasCustomAttrs = false;
|
boolean hasCustomAttrs = false;
|
||||||
for (XMLNode attribute : node.attributes) {
|
for (XMLNode attribute : node.attributes) {
|
||||||
if (!"type".equals(attribute.name) && !"class".equals(attribute.name)) {
|
if (!"type".equals(attribute.name) && !"class".equals(attribute.name)) {
|
||||||
@@ -283,7 +292,13 @@ class GenerateToolByDom4j{
|
|||||||
}
|
}
|
||||||
%>
|
%>
|
||||||
}
|
}
|
||||||
|
<% if(istWriteJSONField && allowEmptyStrings) { %>
|
||||||
|
else {
|
||||||
|
nestXMLTool_<%=cid%> .setText(<%=currEleName%>_<%=cid%>,"null");
|
||||||
|
<%=currEleName%>_<%=cid%>.addAttribute("null", "true");
|
||||||
|
}
|
||||||
<%
|
<%
|
||||||
|
}
|
||||||
if(outputAsXSD){
|
if(outputAsXSD){
|
||||||
%>
|
%>
|
||||||
else{
|
else{
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.components.localprovider</artifactId>
|
<artifactId>org.talend.designer.components.localprovider</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.core.generic</artifactId>
|
<artifactId>org.talend.designer.core.generic</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.core</artifactId>
|
<artifactId>org.talend.designer.core</artifactId>
|
||||||
|
|||||||
@@ -1948,7 +1948,7 @@ public class DataProcess implements IGeneratingProcess {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (duplicatedProcess.getComponentsType().equals(ComponentCategory.CATEGORY_4_DI.getName()) && PluginChecker.isTIS()) {
|
if (duplicatedProcess.getComponentsType().equals(ComponentCategory.CATEGORY_4_DI.getName()) && PluginChecker.isTIS() && !Boolean.getBoolean("deactivate_extended_component_log")) {
|
||||||
final String talendJobLogComponent = "tJobStructureCatcher";
|
final String talendJobLogComponent = "tJobStructureCatcher";
|
||||||
final String uid4TalendJobLogComponent = "talendJobLog";
|
final String uid4TalendJobLogComponent = "talendJobLog";
|
||||||
IComponent jobStructComponent = ComponentsFactoryProvider.getInstance().get(talendJobLogComponent, ComponentCategory.CATEGORY_4_DI.getName());
|
IComponent jobStructComponent = ComponentsFactoryProvider.getInstance().get(talendJobLogComponent, ComponentCategory.CATEGORY_4_DI.getName());
|
||||||
|
|||||||
@@ -266,6 +266,9 @@ public class TextController extends AbstractElementPropertySectionController {
|
|||||||
* @param value
|
* @param value
|
||||||
*/
|
*/
|
||||||
private void checkTextError(IElementParameter param, Text labelText, Object value) {
|
private void checkTextError(IElementParameter param, Text labelText, Object value) {
|
||||||
|
if (elem instanceof Node) {
|
||||||
|
labelText.setToolTipText(VARIABLE_TOOLTIP + param.getVariableName());
|
||||||
|
}
|
||||||
// Only for job settings View.
|
// Only for job settings View.
|
||||||
// job settings extra (feature 2710)
|
// job settings extra (feature 2710)
|
||||||
if (param.getCategory() == EComponentCategory.STATSANDLOGS || param.getCategory() == EComponentCategory.EXTRA) {
|
if (param.getCategory() == EComponentCategory.STATSANDLOGS || param.getCategory() == EComponentCategory.EXTRA) {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.dbmap</artifactId>
|
<artifactId>org.talend.designer.dbmap</artifactId>
|
||||||
|
|||||||
@@ -1325,6 +1325,7 @@ public abstract class DbGenerationManager {
|
|||||||
|
|
||||||
protected String initExpression(DbMapComponent component, ExternalDbMapEntry dbMapEntry) {
|
protected String initExpression(DbMapComponent component, ExternalDbMapEntry dbMapEntry) {
|
||||||
String quote = getQuote(component);
|
String quote = getQuote(component);
|
||||||
|
String quto_mark = TalendQuoteUtils.QUOTATION_MARK;
|
||||||
String expression = dbMapEntry.getExpression();
|
String expression = dbMapEntry.getExpression();
|
||||||
if (expression != null) {
|
if (expression != null) {
|
||||||
List<Map<String, String>> itemNameList = null;
|
List<Map<String, String>> itemNameList = null;
|
||||||
@@ -1349,7 +1350,7 @@ public abstract class DbGenerationManager {
|
|||||||
itemNameList = mapParser2.parseInTableEntryLocations(expression);
|
itemNameList = mapParser2.parseInTableEntryLocations(expression);
|
||||||
}
|
}
|
||||||
|
|
||||||
String quoParser = "[\\\\]?\\" + quote; //$NON-NLS-1$
|
String quto_markParser = "[\\\\]?\\" + quto_mark; //$NON-NLS-1$
|
||||||
for (Map<String, String> itemNamemap : itemNameList) {
|
for (Map<String, String> itemNamemap : itemNameList) {
|
||||||
Set<Entry<String, String>> set = itemNamemap.entrySet();
|
Set<Entry<String, String>> set = itemNamemap.entrySet();
|
||||||
Iterator<Entry<String, String>> ite = set.iterator();
|
Iterator<Entry<String, String>> ite = set.iterator();
|
||||||
@@ -1415,16 +1416,12 @@ public abstract class DbGenerationManager {
|
|||||||
}
|
}
|
||||||
if (expression.trim().equals(tableValue + "." + oriName)) {
|
if (expression.trim().equals(tableValue + "." + oriName)) {
|
||||||
expression = tableValue + "." + getColumnName(iconn, oriName, quote);
|
expression = tableValue + "." + getColumnName(iconn, oriName, quote);
|
||||||
if(TalendQuoteUtils.QUOTATION_MARK.equals(quote)){
|
expression = expression.replaceAll(quto_markParser,"\\\\" +quto_mark); //$NON-NLS-1$
|
||||||
expression = expression.replaceAll(quoParser,"\\\\" +quote); //$NON-NLS-1$
|
|
||||||
}
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (expression.trim().equals(originaltableName + "." + oriName)) {
|
if (expression.trim().equals(originaltableName + "." + oriName)) {
|
||||||
expression = originaltableName + "." + getColumnName(iconn, oriName, quote);
|
expression = originaltableName + "." + getColumnName(iconn, oriName, quote);
|
||||||
if(TalendQuoteUtils.QUOTATION_MARK.equals(quote)){
|
expression = expression.replaceAll(quto_markParser,"\\\\" +quto_mark); //$NON-NLS-1$
|
||||||
expression = expression.replaceAll(quoParser,"\\\\" +quote); //$NON-NLS-1$
|
|
||||||
}
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// if it is temp delived table, use label to generate sql
|
// if it is temp delived table, use label to generate sql
|
||||||
@@ -1438,9 +1435,7 @@ public abstract class DbGenerationManager {
|
|||||||
}
|
}
|
||||||
expression = expression.replaceFirst(tableValue + "\\." + co.getLabel(), //$NON-NLS-1$
|
expression = expression.replaceFirst(tableValue + "\\." + co.getLabel(), //$NON-NLS-1$
|
||||||
tableValue + "\\." + oriName); //$NON-NLS-1$
|
tableValue + "\\." + oriName); //$NON-NLS-1$
|
||||||
if(TalendQuoteUtils.QUOTATION_MARK.equals(quote)){
|
expression = replaceAuotes(expression, quto_markParser, quto_mark);
|
||||||
expression = replaceAuotes(expression, quoParser, quote);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.documentation</artifactId>
|
<artifactId>org.talend.designer.documentation</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.filemultischemas</artifactId>
|
<artifactId>org.talend.designer.filemultischemas</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.fileoutputxml</artifactId>
|
<artifactId>org.talend.designer.fileoutputxml</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.gefabstractmap</artifactId>
|
<artifactId>org.talend.designer.gefabstractmap</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.mapper.advanced</artifactId>
|
<artifactId>org.talend.designer.mapper.advanced</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.mapper</artifactId>
|
<artifactId>org.talend.designer.mapper</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.maven.job</artifactId>
|
<artifactId>org.talend.designer.maven.job</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.publish.core</artifactId>
|
<artifactId>org.talend.designer.publish.core</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.rowgenerator</artifactId>
|
<artifactId>org.talend.designer.rowgenerator</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.runprocess</artifactId>
|
<artifactId>org.talend.designer.runprocess</artifactId>
|
||||||
|
|||||||
@@ -1461,19 +1461,20 @@ public class JavaProcessor extends AbstractJavaProcessor implements IJavaBreakpo
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
useRelativeClasspath = hasCXFComponent;
|
||||||
IFolder execPath = talendJavaProject.getTargetFolder();
|
IFolder execPath = talendJavaProject.getTargetFolder();
|
||||||
for (ModuleNeeded neededModule : neededModules) {
|
for (ModuleNeeded neededModule : neededModules) {
|
||||||
MavenArtifact artifact = MavenUrlHelper.parseMvnUrl(neededModule.getMavenUri());
|
MavenArtifact artifact = MavenUrlHelper.parseMvnUrl(neededModule.getMavenUri());
|
||||||
String relativeJarPath = JavaProcessorUtilities.getJavaProjectLibFolder2()
|
IPath jarPath = JavaProcessorUtilities.getJavaProjectLibFolder2()
|
||||||
.getFile(MavenUrlHelper.generateModuleNameByMavenURI(neededModule.getMavenUri())).getLocation()
|
.getFile(MavenUrlHelper.generateModuleNameByMavenURI(neededModule.getMavenUri())).getLocation();
|
||||||
.makeRelativeTo(execPath.getLocation())
|
|
||||||
.toPortableString();
|
|
||||||
String artifactId = artifact.getArtifactId();
|
String artifactId = artifact.getArtifactId();
|
||||||
boolean hasSapjco3 = "sapjco3".equals(artifactId) && compareSapjco3Version(relativeJarPath) > 0; //$NON-NLS-1$
|
boolean hasSapjco3 = "sapjco3".equals(artifactId) //$NON-NLS-1$
|
||||||
|
&& compareSapjco3Version(jarPath.toPortableString()) > 0;
|
||||||
boolean hasSapidoc3 = "sapidoc3".equals(artifactId); //$NON-NLS-1$
|
boolean hasSapidoc3 = "sapidoc3".equals(artifactId); //$NON-NLS-1$
|
||||||
useRelativeClasspath = hasCXFComponent || hasSapjco3 || hasSapidoc3;
|
if (hasCXFComponent) {
|
||||||
if (useRelativeClasspath) {
|
libPath.append(jarPath.makeRelativeTo(execPath.getLocation()).toPortableString()).append(classPathSeparator);
|
||||||
libPath.append(relativeJarPath).append(classPathSeparator);
|
} else if (hasSapjco3 || hasSapidoc3) {
|
||||||
|
libPath.append(jarPath.toPortableString()).append(classPathSeparator);
|
||||||
} else {
|
} else {
|
||||||
libPath.append(PomUtil.getAbsArtifactPathAsCP(artifact)).append(classPathSeparator);
|
libPath.append(PomUtil.getAbsArtifactPathAsCP(artifact)).append(classPathSeparator);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.runtime.visualization.tools</artifactId>
|
<artifactId>org.talend.designer.runtime.visualization.tools</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.runtime.visualization</artifactId>
|
<artifactId>org.talend.designer.runtime.visualization</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.scd</artifactId>
|
<artifactId>org.talend.designer.scd</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.spss</artifactId>
|
<artifactId>org.talend.designer.spss</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.tutorials</artifactId>
|
<artifactId>org.talend.designer.tutorials</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.unifiedcomponent</artifactId>
|
<artifactId>org.talend.designer.unifiedcomponent</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.webservice</artifactId>
|
<artifactId>org.talend.designer.webservice</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.designer.xmlmap</artifactId>
|
<artifactId>org.talend.designer.xmlmap</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.expressionbuilder</artifactId>
|
<artifactId>org.talend.expressionbuilder</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.libraries.asm</artifactId>
|
<artifactId>org.talend.libraries.asm</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.libraries.crm</artifactId>
|
<artifactId>org.talend.libraries.crm</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.libraries.css</artifactId>
|
<artifactId>org.talend.libraries.css</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.libraries.custom</artifactId>
|
<artifactId>org.talend.libraries.custom</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.libraries.edifact</artifactId>
|
<artifactId>org.talend.libraries.edifact</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.libraries.ehcache</artifactId>
|
<artifactId>org.talend.libraries.ehcache</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.libraries.excel</artifactId>
|
<artifactId>org.talend.libraries.excel</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.libraries.ftp</artifactId>
|
<artifactId>org.talend.libraries.ftp</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.libraries.groovy</artifactId>
|
<artifactId>org.talend.libraries.groovy</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.libraries.guava</artifactId>
|
<artifactId>org.talend.libraries.guava</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.libraries.hadoop.mapr.5.0.0</artifactId>
|
<artifactId>org.talend.libraries.hadoop.mapr.5.0.0</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.libraries.jax</artifactId>
|
<artifactId>org.talend.libraries.jax</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.libraries.jetty</artifactId>
|
<artifactId>org.talend.libraries.jetty</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.libraries.json</artifactId>
|
<artifactId>org.talend.libraries.json</artifactId>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tdi-studio-se</artifactId>
|
<artifactId>tdi-studio-se</artifactId>
|
||||||
<version>7.2.1-SNAPSHOT</version>
|
<version>7.2.1</version>
|
||||||
<relativePath>../../../</relativePath>
|
<relativePath>../../../</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>org.talend.libraries.microsoft</artifactId>
|
<artifactId>org.talend.libraries.microsoft</artifactId>
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user