Compare commits
64 Commits
release/7.
...
patch/TPS-
| Author | SHA1 | Date | |
|---|---|---|---|
|
20bf94ec21 | ||
|
|
fd60c1edca | ||
|
|
568088d394 | ||
|
|
7e911f0b99 | ||
|
|
16b2b9bf62 | ||
|
|
44aabcdecd | ||
|
|
839af2e2f8 | ||
|
|
e89df33f76 | ||
|
|
a8c01d85da | ||
|
|
2420214bf6 | ||
|
|
1c5404c12e | ||
|
|
49cba020f9 | ||
|
|
396868b931 | ||
|
|
4f429f6a98 | ||
|
|
218aa295f1 | ||
|
|
c364565c33 | ||
|
|
04fc9056b9 | ||
|
|
507da793eb | ||
|
|
9dfee4a013 | ||
|
|
d8e2ccab3a | ||
|
|
2b65a9840a | ||
|
|
894c21fe93 | ||
|
|
b4a8746cac | ||
|
|
4cc9be4a2f | ||
|
|
a3f4dc7557 | ||
|
|
b2bd5439f1 | ||
|
|
434ac24774 | ||
|
|
4d69eb252c | ||
|
|
caa3640ded | ||
|
|
6c067da155 | ||
|
|
c40dca2c00 | ||
|
|
3de4dbb799 | ||
|
|
a1151bcece | ||
|
|
f3f89474fd | ||
|
|
2fe67d5967 | ||
|
|
d23c6228b7 | ||
|
|
4cb4692c9d | ||
|
|
81b7b71d0f | ||
|
|
354a8b3cb9 | ||
|
|
66a15122e2 | ||
|
|
c2252e26e2 | ||
|
|
b62a5e2773 | ||
|
|
d696e53d77 | ||
|
|
8417201494 | ||
|
|
8097a8ea2e | ||
|
|
357bde19c4 | ||
|
|
d8e6aafe96 | ||
|
|
5e3c1ecb69 | ||
|
|
f21e038475 | ||
|
|
dae7882c74 | ||
|
|
c18baef9fc | ||
|
|
54a1745389 | ||
|
|
e12a1522e8 | ||
|
|
02928daa0a | ||
|
|
cd4245b810 | ||
|
|
e65add59b6 | ||
|
|
e0c6e58cab | ||
|
|
c788fb873b | ||
|
|
9c31c2869d | ||
|
|
e91f8c1b5d | ||
|
|
6d16ec2e3e | ||
|
|
d5dfa732da | ||
|
|
49d093c671 | ||
|
|
0f3b302525 |
66
PATCH_RELEASE_NOTE.md
Normal file
66
PATCH_RELEASE_NOTE.md
Normal file
@@ -0,0 +1,66 @@
|
||||
---
|
||||
version: 7.2.1
|
||||
module: https://talend.poolparty.biz/coretaxonomy/42
|
||||
product:
|
||||
- https://talend.poolparty.biz/coretaxonomy/23
|
||||
- https://talend.poolparty.biz/coretaxonomy/26
|
||||
- https://talend.poolparty.biz/coretaxonomy/24
|
||||
---
|
||||
|
||||
# TPS-3403
|
||||
|
||||
| Info | Value |
|
||||
| ---------------- | ---------------- |
|
||||
| Patch Name | Patch\_20190907\_TPS-3403\_v1-7.2.1 |
|
||||
| Release Date | 2019-09-07 |
|
||||
| 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 this following fixe:
|
||||
|
||||
- TPS-3403 filecopy fail with java11 (TDI-42230)
|
||||
|
||||
## 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}
|
||||
|
||||
## Affected files for this patch
|
||||
|
||||
The following files are installed by this patch:
|
||||
|
||||
- plugins/org.talend.designer.components.localprovider\_7.2.1.20190614\_0309/components/tFileCopy/tFileCopy\_java.xml
|
||||
- plugins/org.talend.libraries.custom\_7.2.1.20181114\_0551/lib/filecopy-2.0.0.jar
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.designer.abstractmap
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.abstractmap.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.designer.alfrescooutput
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.alfrescooutput.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Bundle-Vendor: .Talend SA.
|
||||
Fragment-Host: org.talend.designer.business.diagram
|
||||
Bundle-Localization: plugin
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.business.diagram.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.designer.codegen
|
||||
Bundle-Localization: plugin
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.codegen.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.designer.components.exchange
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.exchange.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.designer.core
|
||||
Bundle-Localization: plugin
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.core.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.designer.dbmap
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.dbmap.nl</artifactId>
|
||||
|
||||
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl
|
||||
Bundle-SymbolicName: org.talend.designer.documentation.nl
|
||||
Bundle-Version: 7.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.designer.documentation
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.documentation.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.designer.fileoutputxml
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.fileoutputxml.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.designer.gefabstractmap
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.gefabstractmap.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.designer.mapper
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.mapper.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Bundle-Vendor: .Talend SA.
|
||||
Fragment-Host: org.talend.designer.maven.job
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.job.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.designer.rowgenerator
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.rowgenerator.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Bundle-Vendor: .Talend SA.
|
||||
Fragment-Host: org.talend.designer.runprocess
|
||||
Bundle-Localization: plugin
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.runprocess.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.designer.scd
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.scd.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.designer.webservice
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.webservice.nl</artifactId>
|
||||
|
||||
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl
|
||||
Bundle-SymbolicName: org.talend.designer.xmlmap.nl
|
||||
Bundle-Version: 7.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.designer.xmlmap
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.xmlmap.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.expressionbuilder
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.expressionbuilder.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.presentation.onboarding.resource
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.presentation.onboarding.resource.tos
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>
|
||||
|
||||
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl
|
||||
Bundle-SymbolicName: org.talend.repository.ftp.nl
|
||||
Bundle-Version: 7.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.repository.ftp
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.ftp.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.repository.json
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.json.nl</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.repository.nl
|
||||
Bundle-Version: 7.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.repository
|
||||
Bundle-Localization: plugin
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.repository.view.di
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.view.di.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.sbi.engines.client
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.sbi.engines.client.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Fragment-Host: org.talend.spagic.engines.client
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.spagic.engines.client.nl</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Bundle-Vendor: .Talend SA.
|
||||
Fragment-Host: org.talend.sqlbuilder
|
||||
Bundle-Localization: plugin
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.sqlbuilder.nl</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.designer.business.feature" label="Business Feature" version="7.3.1.qualifier" provider-name=".Talend SA.">
|
||||
<feature id="org.talend.designer.business.feature" label="Business Feature" version="7.2.2.qualifier" provider-name=".Talend SA.">
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#business-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#business-feature</description>
|
||||
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
|
||||
<license>The licence are describe in branding feature</license>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.business.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.designer.feature" label="Designer Feature" version="7.3.1.qualifier" provider-name=".Talend SA.">
|
||||
<feature id="org.talend.designer.feature" label="Designer Feature" version="7.2.2.qualifier" provider-name=".Talend SA.">
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#designer-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#designer-feature</description>
|
||||
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
|
||||
<license>The licence are describe in branding feature</license>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.fragment.jars.di.feature"
|
||||
label="Fragment Jars in DI"
|
||||
version="7.3.1.qualifier">
|
||||
version="7.2.2.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
[Enter Feature Description here.]
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.fragment.jars.di.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.rcp.branding.tos.feature" label="Tos branding feature" version="7.3.1.qualifier" provider-name=".Talend SA." plugin="org.talend.rcp.branding.tos">
|
||||
<feature id="org.talend.rcp.branding.tos.feature" label="Tos branding feature" version="7.2.2.qualifier" provider-name=".Talend SA." plugin="org.talend.rcp.branding.tos">
|
||||
<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>[Enter License Description here.]</license>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.branding.tos.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.rcp.branding.tos.test.feature" label="Test feature for TOS" version="7.3.1.qualifier">
|
||||
<feature id="org.talend.rcp.branding.tos.test.feature" label="Test feature for TOS" version="7.2.2.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>
|
||||
@@ -55,6 +55,5 @@
|
||||
<plugin id="org.talend.testutils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
<plugin id="org.talend.updates.runtime.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.utils.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.sdk.component.studio-integration.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="test.all.test.suite" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
</feature>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.repository.feature" label="Repository Feature" version="7.3.1.qualifier" provider-name=".Talend SA.">
|
||||
<feature id="org.talend.repository.feature" label="Repository Feature" version="7.2.2.qualifier" provider-name=".Talend SA.">
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#repository-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#repository-feature</description>
|
||||
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
|
||||
<license>The licence are describe in branding feature</license>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.sbi.feature" label="SBI Feature" version="7.3.1.qualifier" provider-name=".Talend SA.">
|
||||
<feature id="org.talend.sbi.feature" label="SBI Feature" version="7.2.2.qualifier" provider-name=".Talend SA.">
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#sbi-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#sbi-feature</description>
|
||||
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
|
||||
<license>The licence are describe in branding feature</license>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.sbi.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.spagic.feature" label="SPAGIC Feature" version="7.3.1.qualifier" provider-name=".Talend SA.">
|
||||
<feature id="org.talend.spagic.feature" label="SPAGIC Feature" version="7.2.2.qualifier" provider-name=".Talend SA.">
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#spagic-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#sbi-feature</description>
|
||||
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
|
||||
<license>The licence are describe in branding feature</license>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.spagic.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.tos.components.feature" label="Components-feature" version="7.3.1.qualifier">
|
||||
<feature id="org.talend.tos.components.feature" label="Components-feature" version="7.2.2.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>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.components.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.tos.core.feature" label="Feature" version="7.3.1.qualifier">
|
||||
<feature id="org.talend.tos.core.feature" label="Feature" version="7.2.2.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>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.core.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.tos.feature" label="Tos feature" version="7.3.1.qualifier" provider-name=".Talend SA.">
|
||||
<feature id="org.talend.tos.feature" label="Tos feature" version="7.2.2.qualifier" provider-name=".Talend SA.">
|
||||
<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>[Enter License Description here.]</license>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.tos.libraries.feature" label="Libraries_feature" version="7.3.1.qualifier">
|
||||
<feature id="org.talend.tos.libraries.feature" label="Libraries_feature" version="7.2.2.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>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.libraries.feature</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Bundle-Activator: org.talend.designer.abstractmap.MapPlugin
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.talend.core,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.abstractmap</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Bundle-Vendor: .Talend SA.
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.talend.core,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.alfrescooutput</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Bundle-ClassPath: .
|
||||
Bundle-Activator: org.talend.designer.business.model.business.diagram.part.BusinessDiagramEditorPlugin
|
||||
Bundle-Vendor: %providerName
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.business.diagram</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Bundle-Localization: plugin
|
||||
Require-Bundle: org.talend.core.repository,
|
||||
org.eclipse.emf.codegen,
|
||||
@@ -22,7 +22,6 @@ Require-Bundle: org.talend.core.repository,
|
||||
org.apache.log4j,
|
||||
org.talend.components.api,
|
||||
org.talend.daikon,
|
||||
org.talend.daikon.crypto.utils,
|
||||
org.talend.designer.core.generic
|
||||
Eclipse-LazyStart: true
|
||||
Bundle-ClassPath: .
|
||||
|
||||
@@ -51,7 +51,6 @@ String cid = node.getUniqueName();
|
||||
|
||||
List<? extends INode> jobCatcherNodes = process.getNodesOfType("tJobStructureCatcher");
|
||||
boolean enableLogStash = jobCatcherNodes != null && !jobCatcherNodes.isEmpty();
|
||||
INode jobCatcherNode = enableLogStash ? jobCatcherNodes.get(0) : null;
|
||||
boolean logstashCurrent = !cid.startsWith("tJobStructureCatcher") && !cid.startsWith("talend") && enableLogStash;
|
||||
|
||||
if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
|
||||
@@ -151,7 +150,6 @@ if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
List<IMetadataTable> metadatas = node.getMetadataList();
|
||||
if ((!node.isSubProcessStart())&&(NodeUtil.isDataAutoPropagated(node))) {
|
||||
if (inputColName!=null) {
|
||||
@@ -177,114 +175,6 @@ if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//log runtime lineage
|
||||
boolean enable_runtime_lineage_log = Boolean.getBoolean("enable_runtime_lineage_log");
|
||||
if(enable_runtime_lineage_log && jobCatcherNode!=null) {//}
|
||||
|
||||
List<? extends IConnection> outConns = node.getOutgoingConnections();
|
||||
if(!outConns.isEmpty()) {
|
||||
%>
|
||||
if(tos_count_<%=node.getUniqueName() %> == 0) {
|
||||
<%
|
||||
//}
|
||||
}
|
||||
|
||||
for (IConnection conn : outConns) {
|
||||
if(!conn.getLineStyle().equals(EConnectionType.FLOW_MAIN) && !conn.getLineStyle().equals(EConnectionType.FLOW_MERGE) && !conn.getLineStyle().equals(EConnectionType.FLOW_REF)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
IMetadataTable metadata = conn.getMetadataTable();
|
||||
if (metadata==null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
List<IMetadataColumn> columns = metadata.getListColumns();
|
||||
|
||||
if(columns == null || columns.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
%>
|
||||
|
||||
class SchemaUtil_<%=cid%> {
|
||||
|
||||
public java.util.List<java.util.Map<String, String>> getSchema(final <%=NodeUtil.getPrivateConnClassName(conn) %>Struct <%=conn.getName()%>) {
|
||||
java.util.List<java.util.Map<String, String>> schema = new java.util.ArrayList<>();
|
||||
java.util.Map<String, String> field = null;
|
||||
<%
|
||||
for(IMetadataColumn column : columns){
|
||||
if("id_Dynamic".equals(column.getTalendType())) {
|
||||
%>
|
||||
routines.system.Dynamic dynamic = <%=conn.getName()%>.<%=column.getLabel()%>;
|
||||
if(dynamic != null) {
|
||||
for(routines.system.DynamicMetadata metadata : dynamic.metadatas) {
|
||||
field = new java.util.HashMap<>();
|
||||
field.put("name", metadata.getName());
|
||||
field.put("origin_name", metadata.getDbName());
|
||||
field.put("iskey", "" + metadata.isKey());
|
||||
field.put("talend_type", metadata.getType());
|
||||
field.put("type", metadata.getDbType());
|
||||
field.put("nullable", "" + metadata.isNullable());
|
||||
field.put("pattern", metadata.getFormat());
|
||||
field.put("length", "" + metadata.getLength());
|
||||
field.put("precision", "" + metadata.getPrecision());
|
||||
schema.add(field);
|
||||
}
|
||||
}
|
||||
|
||||
<%
|
||||
continue;
|
||||
}
|
||||
|
||||
String pattern = column.getPattern();
|
||||
if(pattern == null || pattern.isEmpty() || pattern.equals("\"\"")) {
|
||||
pattern = "";
|
||||
}
|
||||
%>
|
||||
field = new java.util.HashMap<>();
|
||||
field.put("name", "<%=column.getLabel()%>");
|
||||
field.put("origin_name", "<%=column.getOriginalDbColumnName()%>");
|
||||
field.put("iskey", "<%=column.isKey()%>");
|
||||
field.put("talend_type", "<%=column.getTalendType()%>");
|
||||
field.put("type", "<%=column.getType()%>");
|
||||
field.put("nullable", "<%=column.isNullable()%>");
|
||||
field.put("pattern", "<%=pattern%>");
|
||||
field.put("length", "<%=column.getLength()%>");
|
||||
field.put("precision", "<%=column.getPrecision()%>");
|
||||
schema.add(field);
|
||||
<%
|
||||
}
|
||||
%>
|
||||
return schema;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
java.util.List<java.util.Map<String, String>> schema_<%=cid%> = new SchemaUtil_<%=cid%>().getSchema(<%=conn.getName()%>);
|
||||
<%
|
||||
INode target = conn.getTarget();
|
||||
String targetNodeId = target.getUniqueName();
|
||||
String targetNodeComponent = target.getComponent().getName();
|
||||
|
||||
%>
|
||||
<%=jobCatcherNode.getUniqueName()%>.addConnectionSchemaMessage("<%=node.getUniqueName()%>","<%=node.getComponent().getName()%>",
|
||||
"<%=targetNodeId%>","<%=targetNodeComponent%>", "<%=conn.getUniqueName()%>" + iterateId, schema_<%=cid%>);
|
||||
<%=jobCatcherNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
|
||||
<%
|
||||
}
|
||||
|
||||
if(!outConns.isEmpty()) {
|
||||
//{
|
||||
%>
|
||||
}
|
||||
<%
|
||||
}
|
||||
|
||||
//{
|
||||
}
|
||||
|
||||
//======================================TDI-17183 end=====================================
|
||||
boolean traceCodeGenerated = false;
|
||||
for (IConnection conn : node.getOutgoingConnections()) {
|
||||
@@ -439,26 +329,14 @@ end_Hash.put("<%=node.getUniqueName() %>", System.currentTimeMillis());
|
||||
}
|
||||
// Else, that means the component is a ON_COMPONENT_OK virtual component typed.
|
||||
}
|
||||
|
||||
|
||||
if(generateMethodCall) {
|
||||
/*check if parralel iterate call not finished from this component */
|
||||
boolean parallelIterate = false;
|
||||
for (IConnection iterateConn : iterateConnSet) {
|
||||
parallelIterate = "true".equals(ElementParameterParser.getValue(iterateConn, "__ENABLE_PARALLEL__"));
|
||||
if (parallelIterate) {
|
||||
if (codePart.equals(ECodePart.END)) {
|
||||
String iterateTargetNodeName = iterateConn.getTarget().getUniqueName();
|
||||
%>
|
||||
mtp_<%=iterateTargetNodeName %>.waitForEndOfQueue();
|
||||
<%
|
||||
}
|
||||
}
|
||||
}
|
||||
%>
|
||||
<%=outgoingConn.getTarget().getUniqueName() %>Process(globalMap);
|
||||
<%
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (outgoingConn.getLineStyle().equals(EConnectionType.RUN_IF)) {
|
||||
%>
|
||||
@@ -466,27 +344,12 @@ end_Hash.put("<%=node.getUniqueName() %>", System.currentTimeMillis());
|
||||
<%//send the true status to socket
|
||||
if(stat){
|
||||
%>
|
||||
if(execStat){
|
||||
if(execStat){
|
||||
runStat.updateStatOnConnection("<%=outgoingConn.getUniqueName() %>", 0, "true");
|
||||
}
|
||||
<%
|
||||
}
|
||||
/*check if parralel iterate call not finished from this component */
|
||||
boolean parallelIterate = false;
|
||||
for (IConnection iterateConn : iterateConnSet) {
|
||||
parallelIterate = "true".equals(ElementParameterParser.getValue(iterateConn, "__ENABLE_PARALLEL__"));
|
||||
if (parallelIterate) {
|
||||
if (codePart.equals(ECodePart.END)) {
|
||||
String iterateTargetNodeName = iterateConn.getTarget().getUniqueName();
|
||||
%>
|
||||
mtp_<%=iterateTargetNodeName %>.waitForEndOfQueue();
|
||||
<%
|
||||
}
|
||||
}
|
||||
}
|
||||
%>
|
||||
<%=outgoingConn.getTarget().getUniqueName() %>Process(globalMap);
|
||||
}
|
||||
<%}%>
|
||||
<%=outgoingConn.getTarget().getUniqueName() %>Process(globalMap);
|
||||
}
|
||||
|
||||
<%
|
||||
//send the false status to socket
|
||||
@@ -513,7 +376,7 @@ end_Hash.put("<%=node.getUniqueName() %>", System.currentTimeMillis());
|
||||
parallelIterate = "true".equals(ElementParameterParser.getValue(iterateConn, "__ENABLE_PARALLEL__"));
|
||||
if (parallelIterate) {
|
||||
if (codePart.equals(ECodePart.END)) {
|
||||
String iterateTargetNodeName = iterateConn.getTarget().getUniqueName();
|
||||
String iterateTargetNodeName = iterateConn.getTarget().getUniqueName();
|
||||
%>
|
||||
mtp_<%=iterateTargetNodeName %>.waitForEndOfQueue();
|
||||
|
||||
|
||||
@@ -142,7 +142,6 @@
|
||||
|
||||
List<? extends INode> jobCatcherNodes = node.getProcess().getNodesOfType("tJobStructureCatcher");
|
||||
boolean enableLogStash = jobCatcherNodes != null && !jobCatcherNodes.isEmpty();
|
||||
INode jobCatcherNode = enableLogStash ? jobCatcherNodes.get(0) : null;
|
||||
String cid = node.getUniqueName();
|
||||
boolean logstashCurrent = !cid.startsWith("tJobStructureCatcher") && !cid.startsWith("talend") && enableLogStash;
|
||||
|
||||
@@ -248,69 +247,6 @@
|
||||
log.logCompSetting();
|
||||
|
||||
if(logstashCurrent) {
|
||||
boolean enable_runtime_lineage_log = Boolean.getBoolean("enable_runtime_lineage_log");
|
||||
if(enable_runtime_lineage_log) {
|
||||
%>
|
||||
class ParameterUtil_<%=cid%>{
|
||||
|
||||
public java.util.Map<String, String> getParameter() throws Exception{
|
||||
java.util.Map<String, String> component_parameters = new java.util.HashMap<>();
|
||||
<%
|
||||
java.util.Set<org.talend.core.model.process.EParameterFieldType> ignoredParamsTypes = new java.util.HashSet<org.talend.core.model.process.EParameterFieldType>();
|
||||
ignoredParamsTypes.addAll(
|
||||
java.util.Arrays.asList(
|
||||
org.talend.core.model.process.EParameterFieldType.SCHEMA_TYPE,
|
||||
org.talend.core.model.process.EParameterFieldType.LABEL,
|
||||
org.talend.core.model.process.EParameterFieldType.EXTERNAL,
|
||||
org.talend.core.model.process.EParameterFieldType.MAPPING_TYPE,
|
||||
org.talend.core.model.process.EParameterFieldType.IMAGE,
|
||||
org.talend.core.model.process.EParameterFieldType.TNS_EDITOR,
|
||||
org.talend.core.model.process.EParameterFieldType.WSDL2JAVA,
|
||||
org.talend.core.model.process.EParameterFieldType.GENERATEGRAMMARCONTROLLER,
|
||||
org.talend.core.model.process.EParameterFieldType.GENERATE_SURVIVORSHIP_RULES_CONTROLLER,
|
||||
org.talend.core.model.process.EParameterFieldType.REFRESH_REPORTS,
|
||||
org.talend.core.model.process.EParameterFieldType.BROWSE_REPORTS,
|
||||
org.talend.core.model.process.EParameterFieldType.PALO_DIM_SELECTION,
|
||||
org.talend.core.model.process.EParameterFieldType.GUESS_SCHEMA,
|
||||
org.talend.core.model.process.EParameterFieldType.MATCH_RULE_IMEX_CONTROLLER,
|
||||
org.talend.core.model.process.EParameterFieldType.MEMO_PERL,
|
||||
org.talend.core.model.process.EParameterFieldType.DBTYPE_LIST,
|
||||
org.talend.core.model.process.EParameterFieldType.VERSION,
|
||||
org.talend.core.model.process.EParameterFieldType.TECHNICAL,
|
||||
org.talend.core.model.process.EParameterFieldType.ICON_SELECTION,
|
||||
org.talend.core.model.process.EParameterFieldType.JAVA_COMMAND,
|
||||
org.talend.core.model.process.EParameterFieldType.TREE_TABLE,
|
||||
org.talend.core.model.process.EParameterFieldType.VALIDATION_RULE_TYPE,
|
||||
org.talend.core.model.process.EParameterFieldType.DCSCHEMA,
|
||||
org.talend.core.model.process.EParameterFieldType.SURVIVOR_RELATION,
|
||||
org.talend.core.model.process.EParameterFieldType.REST_RESPONSE_SCHEMA_TYPE
|
||||
)
|
||||
);
|
||||
for(org.talend.core.model.process.IElementParameter ep : org.talend.core.model.utils.NodeUtil.getDisplayedParameters(node)){
|
||||
if(!ep.isLog4JEnabled() || ignoredParamsTypes.contains(ep.getFieldType())){
|
||||
continue;
|
||||
}
|
||||
String name = ep.getName();
|
||||
if(org.talend.core.model.process.EParameterFieldType.PASSWORD.equals(ep.getFieldType())){
|
||||
//not log password
|
||||
}else{
|
||||
String value = org.talend.core.model.utils.NodeUtil.getRuntimeParameterValue(node, ep);
|
||||
%>
|
||||
component_parameters.put("<%=name%>", String.valueOf(<%=value%>));
|
||||
<%
|
||||
}
|
||||
}
|
||||
%>
|
||||
return component_parameters;
|
||||
}
|
||||
}
|
||||
|
||||
<%=jobCatcherNode.getUniqueName()%>.addComponentParameterMessage("<%=node.getUniqueName()%>", "<%=node.getComponent().getName()%>",
|
||||
new ParameterUtil_<%=cid%>().getParameter());
|
||||
<%=jobCatcherNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
|
||||
<%
|
||||
}
|
||||
|
||||
for (INode jobStructureCatcher : jobCatcherNodes) {
|
||||
%>
|
||||
if(enableLogStash) {
|
||||
|
||||
@@ -54,9 +54,7 @@
|
||||
jobFolderName = jobFolderName + JavaResourcesHelper.getJobFolderName(process.getName(), process.getVersion());
|
||||
String jobClassPackageFolder = codeGenArgument.getCurrentProjectName().toLowerCase() + '/' + jobFolderName;
|
||||
|
||||
boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));//log4j enable
|
||||
boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J2_ACTIVATE__"));//log4j2 enable
|
||||
boolean isLog4j1Enabled = !isLog4j2Enabled;//log4j1 enable
|
||||
boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));
|
||||
|
||||
boolean exist_tParallelize = false;
|
||||
List<? extends INode> tParallelizeList = process.getNodesOfType("tParallelize");
|
||||
@@ -447,11 +445,9 @@
|
||||
lastStr = "";
|
||||
}
|
||||
}
|
||||
enableLogStash = "true".equalsIgnoreCase(System.getProperty("monitoring"));
|
||||
|
||||
<%if(isLog4jEnabled){%>
|
||||
if(!"".equals(log4jLevel)){
|
||||
<%if(isLog4j1Enabled){%>
|
||||
if("trace".equalsIgnoreCase(log4jLevel)){
|
||||
log.setLevel(org.apache.log4j.Level.TRACE);
|
||||
}else if("debug".equalsIgnoreCase(log4jLevel)){
|
||||
@@ -468,26 +464,6 @@
|
||||
log.setLevel(org.apache.log4j.Level.OFF);
|
||||
}
|
||||
org.apache.log4j.Logger.getRootLogger().setLevel(log.getLevel());
|
||||
<%}%>
|
||||
|
||||
<%if(isLog4j2Enabled){%>
|
||||
if("trace".equalsIgnoreCase(log4jLevel)){
|
||||
org.apache.logging.log4j.core.config.Configurator.setLevel(log.getName(), org.apache.logging.log4j.Level.TRACE);
|
||||
}else if("debug".equalsIgnoreCase(log4jLevel)){
|
||||
org.apache.logging.log4j.core.config.Configurator.setLevel(log.getName(), org.apache.logging.log4j.Level.DEBUG);
|
||||
}else if("info".equalsIgnoreCase(log4jLevel)){
|
||||
org.apache.logging.log4j.core.config.Configurator.setLevel(log.getName(), org.apache.logging.log4j.Level.INFO);
|
||||
}else if("warn".equalsIgnoreCase(log4jLevel)){
|
||||
org.apache.logging.log4j.core.config.Configurator.setLevel(log.getName(), org.apache.logging.log4j.Level.WARN);
|
||||
}else if("error".equalsIgnoreCase(log4jLevel)){
|
||||
org.apache.logging.log4j.core.config.Configurator.setLevel(log.getName(), org.apache.logging.log4j.Level.ERROR);
|
||||
}else if("fatal".equalsIgnoreCase(log4jLevel)){
|
||||
org.apache.logging.log4j.core.config.Configurator.setLevel(log.getName(), org.apache.logging.log4j.Level.FATAL);
|
||||
}else if ("off".equalsIgnoreCase(log4jLevel)){
|
||||
org.apache.logging.log4j.core.config.Configurator.setLevel(log.getName(), org.apache.logging.log4j.Level.OFF);
|
||||
}
|
||||
org.apache.logging.log4j.core.config.Configurator.setLevel(org.apache.logging.log4j.LogManager.getRootLogger().getName(), log.getLevel());
|
||||
<%}%>
|
||||
}
|
||||
log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Start.");
|
||||
<%}%>
|
||||
@@ -501,39 +477,8 @@
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(jobCatcherNode!=null) {
|
||||
boolean enable_runtime_lineage_log = Boolean.getBoolean("enable_runtime_lineage_log");
|
||||
if(enable_runtime_lineage_log) {
|
||||
%>
|
||||
java.util.Properties p_<%=jobCatcherNode.getUniqueName()%> = new java.util.Properties();
|
||||
p_<%=jobCatcherNode.getUniqueName()%>.setProperty("root.logger", "runtime");
|
||||
p_<%=jobCatcherNode.getUniqueName()%>.setProperty("encoding", "UTF-8");
|
||||
p_<%=jobCatcherNode.getUniqueName()%>.setProperty("application.name", "Talend Studio");
|
||||
p_<%=jobCatcherNode.getUniqueName()%>.setProperty("service.name", "Talend Studio Job");
|
||||
p_<%=jobCatcherNode.getUniqueName()%>.setProperty("instance.name", "Talend Studio Job Instance");
|
||||
p_<%=jobCatcherNode.getUniqueName()%>.setProperty("propagate.appender.exceptions", "none");
|
||||
p_<%=jobCatcherNode.getUniqueName()%>.setProperty("log.appender", "file");
|
||||
p_<%=jobCatcherNode.getUniqueName()%>.setProperty("appender.file.path", "runtime.json");
|
||||
p_<%=jobCatcherNode.getUniqueName()%>.setProperty("appender.file.maxsize", "52428800");
|
||||
p_<%=jobCatcherNode.getUniqueName()%>.setProperty("appender.file.maxbackup", "20");
|
||||
p_<%=jobCatcherNode.getUniqueName()%>.setProperty("host", "false");
|
||||
<%if(isLog4jEnabled) {%>
|
||||
<%if(isLog4j1Enabled) {%>
|
||||
org.apache.log4j.Logger.getLogger("runtime").setLevel(org.apache.log4j.Level.DEBUG);
|
||||
<%}%>
|
||||
|
||||
<%if(isLog4j2Enabled) {%>
|
||||
org.apache.logging.log4j.core.config.Configurator.setLevel("runtime", org.apache.logging.log4j.Level.DEBUG);
|
||||
<%}%>
|
||||
<%} else {%>
|
||||
org.apache.log4j.Logger.getLogger("runtime").setLevel(org.apache.log4j.Level.DEBUG);
|
||||
<%}%>
|
||||
runtime_lineage_logger_<%=jobCatcherNode.getUniqueName()%> = org.talend.job.audit.JobEventAuditLoggerFactory.createJobAuditLogger(p_<%=jobCatcherNode.getUniqueName()%>);
|
||||
<%
|
||||
}
|
||||
|
||||
String location = ElementParameterParser.getValue(jobCatcherNode, "__LOCATION__");
|
||||
if(jobCatcherNode!=null) {
|
||||
String location = ElementParameterParser.getValue(jobCatcherNode, "__LOCATION__");
|
||||
%>
|
||||
if(enableLogStash) {
|
||||
java.util.Properties properties_<%=jobCatcherNode.getUniqueName()%> = new java.util.Properties();
|
||||
@@ -548,27 +493,12 @@
|
||||
properties_<%=jobCatcherNode.getUniqueName()%>.setProperty("appender.file.maxsize", "52428800");
|
||||
properties_<%=jobCatcherNode.getUniqueName()%>.setProperty("appender.file.maxbackup", "20");
|
||||
properties_<%=jobCatcherNode.getUniqueName()%>.setProperty("host", "false");
|
||||
|
||||
System.getProperties().stringPropertyNames().stream()
|
||||
.filter(it -> it.startsWith("monitoring.audit.logger.properties."))
|
||||
.forEach(key -> properties_<%=jobCatcherNode.getUniqueName()%>.setProperty(key.substring("monitoring.audit.logger.properties.".length()), System.getProperty(key)));
|
||||
|
||||
<%if(isLog4jEnabled) {%>
|
||||
<%if(isLog4j1Enabled) {%>
|
||||
org.apache.log4j.Logger.getLogger("audit").setLevel(org.apache.log4j.Level.DEBUG);
|
||||
<%}%>
|
||||
|
||||
<%if(isLog4j2Enabled) {%>
|
||||
org.apache.logging.log4j.core.config.Configurator.setLevel("audit", org.apache.logging.log4j.Level.DEBUG);
|
||||
<%}%>
|
||||
<%} else {%>
|
||||
org.apache.log4j.Logger.getLogger("audit").setLevel(org.apache.log4j.Level.DEBUG);
|
||||
<%}%>
|
||||
|
||||
auditLogger_<%=jobCatcherNode.getUniqueName()%> = org.talend.job.audit.JobEventAuditLoggerFactory.createJobAuditLogger(properties_<%=jobCatcherNode.getUniqueName()%>);
|
||||
}
|
||||
<%
|
||||
}
|
||||
%>
|
||||
%>
|
||||
|
||||
if(clientHost == null) {
|
||||
clientHost = defaultClientHost;
|
||||
@@ -838,25 +768,6 @@ if(execStat) {
|
||||
|
||||
startTime = System.currentTimeMillis();
|
||||
<%
|
||||
|
||||
boolean isCustomProxySettingsUsed = false;
|
||||
List<? extends INode> proxyNodes = process.getNodesOfType("tSetProxy");
|
||||
for (int i = 0; i < proxyNodes.size(); i++) {
|
||||
INode proxyNode = proxyNodes.get(i);
|
||||
String useCustomProxyCheckboxValue = ElementParameterParser.getValue(proxyNode, "__PROXY_GLOBAL__");
|
||||
|
||||
if (useCustomProxyCheckboxValue != null && !"true".equals(useCustomProxyCheckboxValue)) {
|
||||
isCustomProxySettingsUsed = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (isCustomProxySettingsUsed) {
|
||||
%>
|
||||
java.net.ProxySelector proxySelectorOnStartJob = java.net.ProxySelector.getDefault();
|
||||
<%
|
||||
}
|
||||
|
||||
//1. send the begin msg
|
||||
|
||||
for (INode statCatcherNode : process.getNodesOfType("tStatCatcher")) {
|
||||
@@ -1079,13 +990,6 @@ this.globalResumeTicket = true;//to run tPostJob
|
||||
|
||||
<%= ElementParameterParser.getValue(process, "__FOOTER_CODE__")%>
|
||||
|
||||
<%
|
||||
if (isCustomProxySettingsUsed) {
|
||||
%>
|
||||
java.net.ProxySelector.setDefault(proxySelectorOnStartJob);
|
||||
<%
|
||||
}
|
||||
%>
|
||||
end = System.currentTimeMillis();
|
||||
|
||||
if (watch) {
|
||||
@@ -1605,10 +1509,12 @@ if (execStat) {
|
||||
}
|
||||
} else if (arg.startsWith("--log4jLevel=")) {
|
||||
log4jLevel = arg.substring(13);
|
||||
} else if (arg.startsWith("--monitoring") && arg.contains("=")) {//for trunjob call
|
||||
final int equal = arg.indexOf('=');
|
||||
final String key = arg.substring("--".length(), equal);
|
||||
System.setProperty(key, arg.substring(equal + 1));
|
||||
} else if (arg.startsWith("--monitoring=")) {//for trunjob call
|
||||
enableLogStash = "true".equalsIgnoreCase(arg.substring(13));
|
||||
}
|
||||
|
||||
if(!enableLogStash) {
|
||||
enableLogStash = "true".equalsIgnoreCase(System.getProperty("monitoring"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -141,9 +141,7 @@ for (INode node : process.getNodesOfType("tRESTClient")) {
|
||||
boolean talendEsbJobFactory = actAsProvider || !process.getNodesOfType("tRouteInput").isEmpty();
|
||||
boolean talendEsbJob = talendEsbJobFactory || actAsConsumer || ProcessorUtilities.isEsbJob(process);
|
||||
|
||||
boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));//log4j enable
|
||||
boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J2_ACTIVATE__"));//log4j2 enable
|
||||
boolean isLog4j1Enabled = !isLog4j2Enabled;//log4j1 enable
|
||||
boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));
|
||||
|
||||
if (talendMdmJob) {
|
||||
talendJobInterfaces += ", TalendMDMJob"; // Talend MDM job
|
||||
@@ -158,14 +156,7 @@ if (talendEsbJobFactory) {
|
||||
public class <%=className%> implements <%=talendJobInterfaces%> {
|
||||
<%if(isLog4jEnabled){%>
|
||||
static {System.setProperty("TalendJob.log", "<%=className%>.log");}
|
||||
|
||||
<%if(isLog4j1Enabled){%>
|
||||
private static org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(<%=className%>.class);
|
||||
<%}%>
|
||||
|
||||
<%if(isLog4j2Enabled){%>
|
||||
private static org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(<%=className%>.class);
|
||||
<%}%>
|
||||
<%}%>
|
||||
|
||||
protected static void logIgnoredError(String message, Throwable cause) {
|
||||
@@ -372,8 +363,6 @@ public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Ch
|
||||
%>
|
||||
|
||||
<%
|
||||
boolean enable_runtime_lineage_log = Boolean.getBoolean("enable_runtime_lineage_log");
|
||||
|
||||
INode jobCatcherNode = null;
|
||||
for (INode nodeInProcess : processNodes) {
|
||||
String componentName = nodeInProcess.getComponent().getName();
|
||||
@@ -429,13 +418,8 @@ private RunTrace runTrace = new RunTrace();
|
||||
JobStructureCatcherUtils <%=jobCatcherNode.getUniqueName() %> = new JobStructureCatcherUtils(jobName, "<%=process.getId() %>", "<%=process.getVersion() %>");
|
||||
org.talend.job.audit.JobAuditLogger auditLogger_<%=jobCatcherNode.getUniqueName()%> = null;
|
||||
<%
|
||||
if(enable_runtime_lineage_log) {
|
||||
%>
|
||||
org.talend.job.audit.JobAuditLogger runtime_lineage_logger_<%=jobCatcherNode.getUniqueName()%> = null;
|
||||
<%
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
for (INode metterCatcher : process.getNodesOfType("tFlowMeterCatcher")) {
|
||||
%>
|
||||
MetterCatcherUtils <%=metterCatcher.getUniqueName() %> = new MetterCatcherUtils("<%=process.getId() %>", "<%=process.getVersion() %>");
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.codegen</artifactId>
|
||||
|
||||
@@ -94,7 +94,7 @@ public class JavaRoutineSynchronizer extends AbstractRoutineSynchronizer {
|
||||
|
||||
private void syncRoutineItems(Collection<RoutineItem> routineObjects, boolean forceUpdate) throws SystemException {
|
||||
for (RoutineItem routineItem : routineObjects) {
|
||||
syncRoutine(routineItem, true, forceUpdate);
|
||||
syncRoutine(routineItem, true, true, forceUpdate);
|
||||
}
|
||||
syncSystemRoutine(ProjectManager.getInstance().getCurrentProject());
|
||||
}
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Bundle-Activator: org.talend.designer.components.exchange.ExchangePlugin
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.eclipse.ui,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.3.1-M4</version>
|
||||
<version>7.2.2-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.exchange</artifactId>
|
||||
|
||||
@@ -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.3.1.qualifier
|
||||
Bundle-Version: 7.2.2.qualifier
|
||||
Require-Bundle: org.eclipse.core.runtime
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>adal4j</artifactId>
|
||||
|
||||
<version>1.1.1-20191012</version>
|
||||
<version>1.1.1-patch</version>
|
||||
<packaging>jar</packaging>
|
||||
<name>adal4j</name>
|
||||
<description>
|
||||
@@ -105,7 +105,7 @@
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.7.25</version>
|
||||
<version>1.7.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-codec</groupId>
|
||||
|
||||
@@ -33,15 +33,10 @@
|
||||
<version>3.0.1</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.7.25</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
<version>1.7.25</version>
|
||||
<version>1.7.5</version>
|
||||
</dependency>
|
||||
<!-- Spring 3 dependencies -->
|
||||
<dependency>
|
||||
|
||||
@@ -27,8 +27,7 @@ import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import org.apache.commons.lang3.text.WordUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
@@ -42,7 +41,7 @@ import org.json.JSONObject;
|
||||
*/
|
||||
public class JSONHelper {
|
||||
|
||||
private static Logger logger = LoggerFactory.getLogger(JSONHelper.class);
|
||||
private static Logger logger = Logger.getLogger(JSONHelper.class);
|
||||
|
||||
JSONHelper() {
|
||||
// PropertyConfigurator.configure("log4j.properties");
|
||||
|
||||
@@ -1,69 +1,69 @@
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend.libraries</groupId>
|
||||
<artifactId>checkArchive-1.1-20190917</artifactId>
|
||||
<version>6.0.0</version>
|
||||
<name>checkArchive</name>
|
||||
<description>Dependence for tFileArchive and tFileUnAchive</description>
|
||||
<url>http://maven.apache.org</url>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
|
||||
<java.source.version>1.7</java.source.version>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
<snapshotRepository>
|
||||
<id>talend_nexus_deployment</id>
|
||||
<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
<releases>
|
||||
<enabled>false</enabled>
|
||||
</releases>
|
||||
</snapshotRepository>
|
||||
<repository>
|
||||
<id>talend_nexus_deployment</id>
|
||||
<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
<releases>
|
||||
<enabled>true</enabled>
|
||||
</releases>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
|
||||
<dependencies>
|
||||
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-compress -->
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-compress</artifactId>
|
||||
<version>1.19</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/main/java</directory>
|
||||
</resource>
|
||||
</resources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>2.3.2</version>
|
||||
<configuration>
|
||||
<source>${java.source.version}</source>
|
||||
<target>${java.source.version}</target>
|
||||
<showDeprecation>true</showDeprecation>
|
||||
<showWarnings>true</showWarnings>
|
||||
<compilerArgument>-XDignore.symbol.file</compilerArgument>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend.libraries</groupId>
|
||||
<artifactId>checkArchive-1.1-20181130</artifactId>
|
||||
<version>6.0.0</version>
|
||||
<name>checkArchive</name>
|
||||
<description>Dependence for tFileArchive and tFileUnAchive</description>
|
||||
<url>http://maven.apache.org</url>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
|
||||
<java.source.version>1.7</java.source.version>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
<snapshotRepository>
|
||||
<id>talend_nexus_deployment</id>
|
||||
<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
<releases>
|
||||
<enabled>false</enabled>
|
||||
</releases>
|
||||
</snapshotRepository>
|
||||
<repository>
|
||||
<id>talend_nexus_deployment</id>
|
||||
<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
<releases>
|
||||
<enabled>true</enabled>
|
||||
</releases>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
|
||||
<dependencies>
|
||||
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-compress -->
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-compress</artifactId>
|
||||
<version>1.10</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/main/java</directory>
|
||||
</resource>
|
||||
</resources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>2.3.2</version>
|
||||
<configuration>
|
||||
<source>${java.source.version}</source>
|
||||
<target>${java.source.version}</target>
|
||||
<showDeprecation>true</showDeprecation>
|
||||
<showWarnings>true</showWarnings>
|
||||
<compilerArgument>-XDignore.symbol.file</compilerArgument>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<groupId>net.sf.json-lib</groupId>
|
||||
<artifactId>json-lib</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<version>2.4.4-talend</version>
|
||||
<version>2.4.2-talend</version>
|
||||
<name>json-lib</name>
|
||||
|
||||
<properties>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user