Compare commits
90 Commits
patch/TPS-
...
patch/7.0.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cafcccca81 | ||
|
|
f8f8b32a67 | ||
|
|
32de750de8 | ||
|
|
fccc0bee25 | ||
|
|
085b138f84 | ||
|
|
dcf389451a | ||
|
|
5b54b36993 | ||
|
|
fa8b4f0527 | ||
|
|
2e73891eaf | ||
|
|
b3d4649f7c | ||
|
|
f7eeff285a | ||
|
|
f2d74d39e2 | ||
|
|
077eb35d81 | ||
|
|
453514f91e | ||
|
|
58cfc176eb | ||
|
|
cb47feb3a6 | ||
|
|
136dee79ee | ||
|
|
f5e0ba2a85 | ||
|
|
30456071f4 | ||
|
|
0e92a6e63d | ||
|
|
b6e4feb75c | ||
|
|
01b48554f1 | ||
|
|
bdb5d74ec5 | ||
|
|
516a30ea88 | ||
|
|
8e9f2fe0ed | ||
|
|
6135222d08 | ||
|
|
9daf281c36 | ||
|
|
1b128697e9 | ||
|
|
db7478d39e | ||
|
|
ef2b5c4585 | ||
|
|
d1d339951b | ||
|
|
c10bfb7081 | ||
|
|
9381e43254 | ||
|
|
dfb2a2d9b0 | ||
|
|
5dad832ea8 | ||
|
|
9a18883b05 | ||
|
|
f97759d303 | ||
|
|
a199ac5bca | ||
|
|
3b925e8ccb | ||
|
|
36111d561c | ||
|
|
6810d2efac | ||
|
|
9c5ace50db | ||
|
|
b4300999d3 | ||
|
|
9e56d4fb1b | ||
|
|
d7ab17a146 | ||
|
|
f39c5c24e7 | ||
|
|
85e3ed0023 | ||
|
|
f4a8133657 | ||
|
|
5fc7e4bf17 | ||
|
|
b0104a008f | ||
|
|
13a67cfdd2 | ||
|
|
374f1e259d | ||
|
|
036b3d8c45 | ||
|
|
dc685f91c1 | ||
|
|
7afb7c4bf5 | ||
|
|
4450bd0bff | ||
|
|
a8d46bec17 | ||
|
|
e5b73dff0e | ||
|
|
c306520690 | ||
|
|
0f58b49a91 | ||
|
|
c9c983ff66 | ||
|
|
9ffeacd193 | ||
|
|
40a579f2d8 | ||
|
|
5304d090a5 | ||
|
|
480ff02083 | ||
|
|
a40d8869fd | ||
|
|
cd90db66c2 | ||
|
|
cb010e13de | ||
|
|
488af98793 | ||
|
|
bd5ac02ab1 | ||
|
|
8b3d78a8ed | ||
|
|
84f0c26c2c | ||
|
|
1d2e5cb6c3 | ||
|
|
ba5d87d2a8 | ||
|
|
7e7ff7ebeb | ||
|
|
3b8bd49929 | ||
|
|
117abe27d1 | ||
|
|
cee7b6cae0 | ||
|
|
fa2123a1f1 | ||
|
|
54a786b27c | ||
|
|
9287f1d803 | ||
|
|
1c69ee668b | ||
|
|
7c18b0a2bb | ||
|
|
2047c1e0c1 | ||
|
|
f29b192dec | ||
|
|
fa8aa8d024 | ||
|
|
1376766caf | ||
|
|
0a2cd96f37 | ||
|
|
3d1c3a1775 | ||
|
|
d0b54bbaab |
@@ -1,68 +1,70 @@
|
||||
---
|
||||
version: 7.0.1
|
||||
module: https://talend.poolparty.biz/coretaxonomy/42
|
||||
product:
|
||||
- https://talend.poolparty.biz/coretaxonomy/23
|
||||
---
|
||||
|
||||
# TPS-3404
|
||||
|
||||
| Info | Value |
|
||||
| ---------------- | ---------------- |
|
||||
| Patch Name | Patch\_20190920\_TPS-3404\_v1-7.0.1 |
|
||||
| Release Date | 2019-10-11 |
|
||||
| Target Version | 7.0.1.20190226\_1146-patch |
|
||||
| Product affected | Talend Studio |
|
||||
|
||||
## Introduction
|
||||
|
||||
This is a self-contained patch.
|
||||
|
||||
**NOTE**: For information on how to obtain this patch, reach out to your Support contact at Talend.
|
||||
|
||||
## Fixed issues
|
||||
|
||||
This patch contains the following fixes:
|
||||
|
||||
- TPS-3404 [7.0.1] An error occurs on tFileOutputExcel after Iterate when /tmp/profiles folder does not exist (TDI-42092)
|
||||
|
||||
## Prerequisites
|
||||
|
||||
Consider the following requirements for your system:
|
||||
|
||||
- Talend Studio 7.0.1 must be installed.
|
||||
- Patch TPS-2956 must be installed.
|
||||
|
||||
|
||||
## Installation
|
||||
|
||||
### Installing the patch using Software update
|
||||
|
||||
1) Logon TAC and switch to Configuration->Software Update, then enter the correct values and save referring to the documentation: https://help.talend.com/reader/f7Em9WV_cPm2RRywucSN0Q/j9x5iXV~vyxMlUafnDejaQ
|
||||
|
||||
2) Switch to Software update page, where the new patch will be listed. The patch can be downloaded from here into the nexus repository.
|
||||
|
||||
3) On Studio Side: Logon Studio with remote mode, on the logon page the Update button is displayed: click this button to install the patch.
|
||||
|
||||
### Installing the patch using Talend Studio
|
||||
|
||||
1) Create a folder named "patches" under your studio installer directory and copy the patch .zip file to this folder.
|
||||
|
||||
2) Restart your studio: a window pops up, then click OK to install the patch, or restart the commandline and the patch will be installed automatically.
|
||||
|
||||
### Installing the patch using Commandline
|
||||
|
||||
Execute the following commands:
|
||||
|
||||
1. Talend-Studio-win-x86_64.exe -nosplash -application org.talend.commandline.CommandLine -consoleLog -data commandline-workspace startServer -p 8002 --talendDebug
|
||||
2. initRemote {tac_url} -ul {TAC login username} -up {TAC login password}
|
||||
3. checkAndUpdate -tu {TAC login username} -tup {TAC login password}
|
||||
|
||||
## Uninstallation
|
||||
Backup the Affected files list below. Uninstall the patch by restore the backup files.
|
||||
|
||||
## Affected files for this patch
|
||||
|
||||
The following files are installed by this patch:
|
||||
|
||||
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_7.0.1.20190226\_1146-patch/components/tFileOutputExcel/tFileOutputExcel/_begin.javajet
|
||||
---
|
||||
version: 7.0.1
|
||||
module: https://talend.poolparty.biz/coretaxonomy/42
|
||||
product:
|
||||
- https://talend.poolparty.biz/coretaxonomy/23
|
||||
---
|
||||
|
||||
# TPS-3873
|
||||
|
||||
| Info | Value |
|
||||
| ---------------- | ---------------- |
|
||||
| Patch Name | Patch\_20200326_TPS-3873\_v1-7.0.1 |
|
||||
| Release Date | 2020-03-26 |
|
||||
| Target Version | 20180411\_1414-V7.0.1 |
|
||||
| Product affected | Talend Studio |
|
||||
|
||||
## Introduction
|
||||
|
||||
This is a self-contained patch.
|
||||
|
||||
**NOTE**: For information on how to obtain this patch, reach out to your Support contact at Talend.
|
||||
|
||||
## Fixed issues
|
||||
|
||||
This patch contains the following fixes:
|
||||
|
||||
- TPS-3873 [7.0.1] tFileUnarchive : Option "Check the integrity before unzip" states file corrupted while zip file can be unzipped (TDI-41469)
|
||||
|
||||
## Prerequisites
|
||||
|
||||
Consider the following requirements for your system:
|
||||
|
||||
- Talend Studio 7.0.1 must be installed.
|
||||
- Installed Patch_20190218_TPS-2919_v1-7.0.1 in advance
|
||||
|
||||
|
||||
## Installation
|
||||
|
||||
### Installing the patch using Software update
|
||||
|
||||
1) Logon TAC and switch to Configuration->Software Update, then enter the correct values and save referring to the documentation: https://help.talend.com/reader/f7Em9WV_cPm2RRywucSN0Q/j9x5iXV~vyxMlUafnDejaQ
|
||||
|
||||
2) Switch to Software update page, where the new patch will be listed. The patch can be downloaded from here into the nexus repository.
|
||||
|
||||
3) On Studio Side: Logon Studio with remote mode, on the logon page the Update button is displayed: click this button to install the patch.
|
||||
|
||||
### Installing the patch using Talend Studio
|
||||
|
||||
1) Create a folder named "patches" under your studio installer directory and copy the patch .zip file to this folder.
|
||||
|
||||
2) Restart your studio: a window pops up, then click OK to install the patch, or restart the commandline and the patch will be installed automatically.
|
||||
|
||||
### Installing the patch using Commandline
|
||||
|
||||
Execute the following commands:
|
||||
|
||||
1. Talend-Studio-win-x86_64.exe -nosplash -application org.talend.commandline.CommandLine -consoleLog -data commandline-workspace startServer -p 8002 --talendDebug
|
||||
2. initRemote {tac_url} -ul {TAC login username} -up {TAC login password}
|
||||
3. checkAndUpdate -tu {TAC login username} -tup {TAC login password}
|
||||
|
||||
## Uninstallation
|
||||
Backup the Affected files list below. Uninstall the patch by restore the backup files.
|
||||
|
||||
## Affected files for this patch
|
||||
|
||||
The following files are installed by this patch:
|
||||
|
||||
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_7.0.1.20190213\_1315-patch/components/tFileArchive/tFileArchive\_java.xml
|
||||
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_7.0.1.20190213\_1315-patch/components/tFileUnarchive/tFileUnarchive\_java.xml
|
||||
- {Talend\_Studio\_path}/plugins/org.talend.libraries.custom\_7.0.1.20180411\_1414/lib/checkArchive-1.1-20181130.jar
|
||||
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.designer.abstractmap.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.designer.abstractmap
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.abstractmap.nl</artifactId>
|
||||
|
||||
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.designer.alfrescooutput.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.designer.alfrescooutput
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.alfrescooutput.nl</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.designer.business.diagram.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Bundle-Vendor: .Talend SA.
|
||||
Fragment-Host: org.talend.designer.business.diagram
|
||||
Bundle-Localization: plugin
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.business.diagram.nl</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: org.talend.designer.codegen Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.designer.codegen.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.designer.codegen
|
||||
Bundle-Localization: plugin
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.codegen.nl</artifactId>
|
||||
|
||||
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl
|
||||
Bundle-SymbolicName: org.talend.designer.components.exchange.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.designer.components.exchange
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.exchange.nl</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Designer Plug-in Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.designer.core.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.designer.core
|
||||
Bundle-Localization: plugin
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.core.nl</artifactId>
|
||||
|
||||
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.designer.dbmap.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.designer.dbmap
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.dbmap.nl</artifactId>
|
||||
|
||||
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl
|
||||
Bundle-SymbolicName: org.talend.designer.documentation.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.designer.documentation
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.documentation.nl</artifactId>
|
||||
|
||||
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.designer.fileoutputxml.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.designer.fileoutputxml
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.fileoutputxml.nl</artifactId>
|
||||
|
||||
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.designer.gefabstractmap.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.designer.gefabstractmap
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.gefabstractmap.nl</artifactId>
|
||||
|
||||
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Mapper component Plug-in Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.designer.mapper.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.designer.mapper
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.mapper.nl</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Maven Job NL
|
||||
Bundle-SymbolicName: org.talend.designer.maven.job.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Bundle-Vendor: .Talend SA.
|
||||
Fragment-Host: org.talend.designer.maven.job
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.job.nl</artifactId>
|
||||
|
||||
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Rowgenerator Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.designer.rowgenerator.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.designer.rowgenerator
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.rowgenerator.nl</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: org.talend.designer.runprocess.nl fragment
|
||||
Bundle-SymbolicName: org.talend.designer.runprocess.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Bundle-Vendor: .Talend SA.
|
||||
Fragment-Host: org.talend.designer.runprocess
|
||||
Bundle-Localization: plugin
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.runprocess.nl</artifactId>
|
||||
|
||||
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.designer.scd.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.designer.scd
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.scd.nl</artifactId>
|
||||
|
||||
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.designer.webservice.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.designer.webservice
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.webservice.nl</artifactId>
|
||||
|
||||
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl
|
||||
Bundle-SymbolicName: org.talend.designer.xmlmap.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.designer.xmlmap
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.xmlmap.nl</artifactId>
|
||||
|
||||
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Expression Builder Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.expressionbuilder.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.expressionbuilder
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.expressionbuilder.nl</artifactId>
|
||||
|
||||
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: NL
|
||||
Bundle-SymbolicName: org.talend.presentation.onboarding.resource.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.presentation.onboarding.resource
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>
|
||||
|
||||
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: NL
|
||||
Bundle-SymbolicName: org.talend.presentation.onboarding.resource.tos.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.presentation.onboarding.resource.tos
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>
|
||||
|
||||
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl
|
||||
Bundle-SymbolicName: org.talend.repository.ftp.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.repository.ftp
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.ftp.nl</artifactId>
|
||||
|
||||
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.repository.json.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.repository.json
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.json.nl</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.repository.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.repository
|
||||
Bundle-Localization: plugin
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.nl</artifactId>
|
||||
|
||||
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl
|
||||
Bundle-SymbolicName: org.talend.repository.view.di.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.repository.view.di
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.view.di.nl</artifactId>
|
||||
|
||||
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.sbi.engines.client.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.sbi.engines.client
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.sbi.engines.client.nl</artifactId>
|
||||
|
||||
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.spagic.engines.client.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Fragment-Host: org.talend.spagic.engines.client
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.spagic.engines.client.nl</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: org.talend.sqlbuilder Nl Fragment
|
||||
Bundle-SymbolicName: org.talend.sqlbuilder.nl
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Bundle-Vendor: .Talend SA.
|
||||
Fragment-Host: org.talend.sqlbuilder
|
||||
Bundle-Localization: plugin
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.sqlbuilder.nl</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.designer.business.feature"
|
||||
label="Business Feature"
|
||||
version="7.0.2.qualifier"
|
||||
version="7.0.1.qualifier"
|
||||
provider-name=".Talend SA.">
|
||||
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#business-feature">
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.business.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.designer.feature"
|
||||
label="Designer Feature"
|
||||
version="7.0.2.qualifier"
|
||||
version="7.0.1.qualifier"
|
||||
provider-name=".Talend SA.">
|
||||
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#designer-feature">
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.rcp.branding.tos.feature"
|
||||
label="Tos branding feature"
|
||||
version="7.0.2.qualifier"
|
||||
version="7.0.1.qualifier"
|
||||
provider-name=".Talend SA."
|
||||
plugin="org.talend.rcp.branding.tos">
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.branding.tos.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.rcp.branding.tos.test.feature"
|
||||
label="Test feature for TOS"
|
||||
version="7.0.2.qualifier">
|
||||
version="7.0.1.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
[Enter Feature Description here.]
|
||||
@@ -400,12 +400,4 @@
|
||||
version="0.0.0"
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.talend.datatools.xml.test"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
</feature>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.repository.feature"
|
||||
label="Repository Feature"
|
||||
version="7.0.2.qualifier"
|
||||
version="7.0.1.qualifier"
|
||||
provider-name=".Talend SA.">
|
||||
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#repository-feature">
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.sbi.feature"
|
||||
label="SBI Feature"
|
||||
version="7.0.2.qualifier"
|
||||
version="7.0.1.qualifier"
|
||||
provider-name=".Talend SA.">
|
||||
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#sbi-feature">
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.sbi.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.spagic.feature"
|
||||
label="SPAGIC Feature"
|
||||
version="7.0.2.qualifier"
|
||||
version="7.0.1.qualifier"
|
||||
provider-name=".Talend SA.">
|
||||
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#spagic-feature">
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.spagic.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.tos.components.feature"
|
||||
label="Components-feature"
|
||||
version="7.0.2.qualifier">
|
||||
version="7.0.1.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
[Enter Feature Description here.]
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.components.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.tos.feature"
|
||||
label="Tos feature"
|
||||
version="7.0.2.qualifier"
|
||||
version="7.0.1.qualifier"
|
||||
provider-name=".Talend SA.">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.tos.libraries.feature"
|
||||
label="Libraries_feature"
|
||||
version="7.0.2.qualifier">
|
||||
version="7.0.1.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
[Enter Feature Description here.]
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.libraries.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Abstract Map Plug-in
|
||||
Bundle-SymbolicName: org.talend.designer.abstractmap;singleton:=true
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Bundle-Activator: org.talend.designer.abstractmap.MapPlugin
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.talend.core,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.abstractmap</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Alfresco Output Component Plug-in
|
||||
Bundle-SymbolicName: org.talend.designer.alfrescooutput;singleton:=true
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Bundle-Vendor: .Talend SA.
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.talend.core,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.alfrescooutput</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.talend.designer.business.diagram; singleton:=true
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Bundle-ClassPath: .
|
||||
Bundle-Activator: org.talend.designer.business.model.business.diagram.part.BusinessDiagramEditorPlugin
|
||||
Bundle-Vendor: %providerName
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.business.diagram</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: CodeGen Plug-in
|
||||
Bundle-SymbolicName: org.talend.designer.codegen;singleton:=true
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Bundle-Localization: plugin
|
||||
Require-Bundle: org.talend.core.repository,
|
||||
org.eclipse.emf.codegen,
|
||||
|
||||
158
main/plugins/org.talend.designer.codegen/jet_stub/footer.javajet
Normal file → Executable file
158
main/plugins/org.talend.designer.codegen/jet_stub/footer.javajet
Normal file → Executable file
@@ -526,107 +526,85 @@
|
||||
|
||||
}
|
||||
}
|
||||
<% for (IContextParameter ctxParam :params)
|
||||
{
|
||||
%>
|
||||
context.setContextType("<%=ctxParam.getName()%>", "<%=ctxParam.getType()%>");
|
||||
<%
|
||||
if (ctxParam.getType().equals("id_Password")) {
|
||||
%>
|
||||
String pwd_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
|
||||
context.<%=ctxParam.getName()%> = null;
|
||||
if(pwd_<%=ctxParam.getName()%>_value!=null) {
|
||||
if(context_param.containsKey("<%=ctxParam.getName()%>")) {//no need to decrypt if it come from program argument or parent job runtime
|
||||
context.<%=ctxParam.getName()%> = pwd_<%=ctxParam.getName()%>_value;
|
||||
} else if (!pwd_<%=ctxParam.getName()%>_value.isEmpty()) {
|
||||
try {
|
||||
context.<%=ctxParam.getName()%> = routines.system.PasswordEncryptUtil.decryptPassword(pwd_<%=ctxParam.getName()%>_value);
|
||||
context.put("<%=ctxParam.getName()%>",context.<%=ctxParam.getName()%>);
|
||||
} catch (java.lang.RuntimeException e) {
|
||||
//do nothing
|
||||
}
|
||||
}
|
||||
}
|
||||
<%
|
||||
final int maxContextInOneMethodToProcess = 100;
|
||||
int lastMethodNumber = 0;
|
||||
%>
|
||||
class ContextProcessing {
|
||||
private void processContext_0() {
|
||||
<%
|
||||
for (int i = 1; i <= params.size(); i++) {
|
||||
IContextParameter ctxParam = params.get(i-1);
|
||||
if (i % maxContextInOneMethodToProcess == 0) {
|
||||
/* close previous method and declare new */
|
||||
lastMethodNumber++;
|
||||
%>
|
||||
}
|
||||
continue;
|
||||
}
|
||||
String typeToGenerate ="String";
|
||||
if( !(ctxParam.getType().equals("id_File") || ctxParam.getType().equals("id_Directory") ||ctxParam.getType().equals("id_List Of Value")))
|
||||
{
|
||||
typeToGenerate=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true);
|
||||
}
|
||||
if(typeToGenerate.equals("java.util.Date"))
|
||||
{
|
||||
|
||||
private void processContext_<%=lastMethodNumber%>() {
|
||||
<%
|
||||
} //endIf
|
||||
%>
|
||||
context.setContextType("<%=ctxParam.getName()%>", "<%=ctxParam.getType()%>");
|
||||
<%
|
||||
if (ctxParam.getType().equals("id_Password")) {
|
||||
%>
|
||||
String pwd_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
|
||||
context.<%=ctxParam.getName()%> = null;
|
||||
if(pwd_<%=ctxParam.getName()%>_value!=null) {
|
||||
if(context_param.containsKey("<%=ctxParam.getName()%>")) {//no need to decrypt if it come from program argument or parent job runtime
|
||||
context.<%=ctxParam.getName()%> = pwd_<%=ctxParam.getName()%>_value;
|
||||
} else if (!pwd_<%=ctxParam.getName()%>_value.isEmpty()) {
|
||||
try {
|
||||
context.<%=ctxParam.getName()%> = routines.system.PasswordEncryptUtil.decryptPassword(pwd_<%=ctxParam.getName()%>_value);
|
||||
context.put("<%=ctxParam.getName()%>",context.<%=ctxParam.getName()%>);
|
||||
} catch (java.lang.RuntimeException e) {
|
||||
//do nothing
|
||||
}
|
||||
}
|
||||
}
|
||||
<%
|
||||
continue;
|
||||
}
|
||||
String typeToGenerate ="String";
|
||||
if( !(ctxParam.getType().equals("id_File") || ctxParam.getType().equals("id_Directory") ||ctxParam.getType().equals("id_List Of Value"))) {
|
||||
typeToGenerate=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true);
|
||||
}
|
||||
if(typeToGenerate.equals("java.util.Date")) {
|
||||
%>
|
||||
try{
|
||||
String context_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
|
||||
if (context_<%=ctxParam.getName()%>_value == null){
|
||||
context_<%=ctxParam.getName()%>_value = "";
|
||||
}
|
||||
int context_<%=ctxParam.getName()%>_pos = context_<%=ctxParam.getName()%>_value.indexOf(";");
|
||||
String context_<%=ctxParam.getName()%>_pattern = "yyyy-MM-dd HH:mm:ss";
|
||||
if(context_<%=ctxParam.getName()%>_pos > -1){
|
||||
context_<%=ctxParam.getName()%>_pattern = context_<%=ctxParam.getName()%>_value.substring(0, context_<%=ctxParam.getName()%>_pos);
|
||||
context_<%=ctxParam.getName()%>_value = context_<%=ctxParam.getName()%>_value.substring(context_<%=ctxParam.getName()%>_pos + 1);
|
||||
}
|
||||
%>
|
||||
try{
|
||||
String context_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
|
||||
if (context_<%=ctxParam.getName()%>_value == null){
|
||||
context_<%=ctxParam.getName()%>_value = "";
|
||||
}
|
||||
int context_<%=ctxParam.getName()%>_pos = context_<%=ctxParam.getName()%>_value.indexOf(";");
|
||||
String context_<%=ctxParam.getName()%>_pattern = "yyyy-MM-dd HH:mm:ss";
|
||||
if(context_<%=ctxParam.getName()%>_pos > -1){
|
||||
context_<%=ctxParam.getName()%>_pattern = context_<%=ctxParam.getName()%>_value.substring(0, context_<%=ctxParam.getName()%>_pos);
|
||||
context_<%=ctxParam.getName()%>_value = context_<%=ctxParam.getName()%>_value.substring(context_<%=ctxParam.getName()%>_pos + 1);
|
||||
}
|
||||
|
||||
context.<%=ctxParam.getName()%>=(java.util.Date)(new java.text.SimpleDateFormat(context_<%=ctxParam.getName()%>_pattern).parse(context_<%=ctxParam.getName()%>_value));
|
||||
context.<%=ctxParam.getName()%>=(java.util.Date)(new java.text.SimpleDateFormat(context_<%=ctxParam.getName()%>_pattern).parse(context_<%=ctxParam.getName()%>_value));
|
||||
|
||||
} catch(ParseException e) {
|
||||
context.<%=ctxParam.getName()%>=null;
|
||||
}
|
||||
<%
|
||||
} else if(typeToGenerate.equals("Object")||typeToGenerate.equals("String")||typeToGenerate.equals("java.lang.String")) {
|
||||
%>
|
||||
context.<%=ctxParam.getName()%>=(<%=typeToGenerate%>) context.getProperty("<%=ctxParam.getName()%>");
|
||||
<%
|
||||
} else if(typeToGenerate.equals("Character")&&ctxParam.getName()!=null) {
|
||||
%>
|
||||
context.<%=ctxParam.getName()%>= new java.text.StringCharacterIterator(context.getProperty("<%=ctxParam.getName()%>")).first();
|
||||
<%
|
||||
} else {
|
||||
%>
|
||||
try{
|
||||
context.<%=ctxParam.getName()%>=routines.system.ParserUtils.parseTo_<%=typeToGenerate%> (context.getProperty("<%=ctxParam.getName()%>"));
|
||||
} catch(NumberFormatException e){
|
||||
context.<%=ctxParam.getName()%>=null;
|
||||
}
|
||||
<%
|
||||
}
|
||||
}
|
||||
%>
|
||||
} <%/*close last method*/%>
|
||||
public void processAllContext() {
|
||||
<%
|
||||
for (int i = 0; i <=lastMethodNumber; i++) {
|
||||
%>
|
||||
processContext_<%=i %>();
|
||||
<%
|
||||
}
|
||||
%>
|
||||
}catch(ParseException e)
|
||||
{
|
||||
context.<%=ctxParam.getName()%>=null;
|
||||
}
|
||||
<%
|
||||
}else if(typeToGenerate.equals("Object")||typeToGenerate.equals("String")||typeToGenerate.equals("java.lang.String") )
|
||||
{
|
||||
%>
|
||||
context.<%=ctxParam.getName()%>=(<%=typeToGenerate%>) context.getProperty("<%=ctxParam.getName()%>");
|
||||
<%
|
||||
}else if(typeToGenerate.equals("Character")&&ctxParam.getName()!=null)
|
||||
{
|
||||
%>
|
||||
context.<%=ctxParam.getName()%>= new java.text.StringCharacterIterator(context.getProperty("<%=ctxParam.getName()%>")).first();
|
||||
<%
|
||||
} else {
|
||||
%>
|
||||
try{
|
||||
context.<%=ctxParam.getName()%>=routines.system.ParserUtils.parseTo_<%=typeToGenerate%> (context.getProperty("<%=ctxParam.getName()%>"));
|
||||
}catch(NumberFormatException e){
|
||||
context.<%=ctxParam.getName()%>=null;
|
||||
}
|
||||
<%
|
||||
}
|
||||
}
|
||||
|
||||
new ContextProcessing().processAllContext();
|
||||
%>
|
||||
} catch (java.io.IOException ie) {
|
||||
System.err.println("Could not load context "+contextStr);
|
||||
ie.printStackTrace();
|
||||
}
|
||||
|
||||
|
||||
// get context value from parent directly
|
||||
if (parentContextMap != null && !parentContextMap.isEmpty()) {
|
||||
<% for (IContextParameter ctxParam :params){
|
||||
|
||||
@@ -516,8 +516,6 @@ private class TalendException extends Exception {
|
||||
|
||||
if(!(e instanceof TDieException)){
|
||||
<%
|
||||
boolean needCatchTalendException = false;
|
||||
|
||||
if (process.getNodesOfType("tLogCatcher").size() > 0) {
|
||||
List<INode> logCatchers = (List<INode>)process.getNodesOfType("tLogCatcher");
|
||||
for (INode logCatcher : logCatchers) {
|
||||
@@ -549,7 +547,6 @@ private class TalendException extends Exception {
|
||||
if (ElementParameterParser.getValue(logCatcher, "__CATCH_JAVA_EXCEPTION__").equals("true")) {
|
||||
if(logCatcher!=virtualNCatchNode){
|
||||
// 2) launch logCatcher subProcess
|
||||
needCatchTalendException = true;
|
||||
%>
|
||||
<%=logCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
|
||||
<%
|
||||
@@ -562,7 +559,6 @@ private class TalendException extends Exception {
|
||||
<%
|
||||
}
|
||||
if(virtualNCatchNode!=null){
|
||||
needCatchTalendException = true;
|
||||
%>
|
||||
<%=virtualNCatchNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
|
||||
<%
|
||||
@@ -576,12 +572,31 @@ private class TalendException extends Exception {
|
||||
%>
|
||||
}
|
||||
<%
|
||||
boolean needCatchTalendException = false;
|
||||
if (process.getNodesOfType("tLogCatcher").size() > 0) {
|
||||
for(INode node:process.getNodesOfType("tLogCatcher")){
|
||||
if(ElementParameterParser.getValue(node, "__CATCH_JAVA_EXCEPTION__").equals("true")){
|
||||
needCatchTalendException = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ((!needCatchTalendException) && (process.getNodesOfType("tAssertCatcher").size() > 0)) {
|
||||
for(INode node:process.getNodesOfType("tAssertCatcher")){
|
||||
if(ElementParameterParser.getValue(node, "__CATCH_JAVA_EXCEPTION__").equals("true")){
|
||||
needCatchTalendException = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(needCatchTalendException) {
|
||||
//TODO should catch the TalendException in assertcatcher process? but before should not work too as use java reflect, this exception can't catch
|
||||
%>
|
||||
} catch (TalendException e) {
|
||||
// do nothing
|
||||
<%
|
||||
if (process.getNodesOfType("tLogCatcher").size() > 0) {
|
||||
%>
|
||||
} catch (TalendException e) {
|
||||
// do nothing
|
||||
<%
|
||||
}
|
||||
}
|
||||
%>
|
||||
} catch (Exception e) {
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
}
|
||||
|
||||
// for tRecordMatching
|
||||
if(conn.getTarget().getUniqueName().indexOf("tRecordMatching")>-1){
|
||||
if(conn.getTarget().getUniqueName().startsWith("tRecordMatching")){
|
||||
List<Map<String, String>> joinKeys = (List<Map<String,String>>)ElementParameterParser.getObjectValue(conn.getTarget(), "__BLOCKING_DEFINITION__");
|
||||
for(Map<String, String> joinKeyLine : joinKeys){
|
||||
String lookupKey = joinKeyLine.get("LOOKUP_COLUMN");
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.codegen</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Exchange Plug-in
|
||||
Bundle-SymbolicName: org.talend.designer.components.exchange;singleton:=true
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Bundle-Activator: org.talend.designer.components.exchange.ExchangePlugin
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.eclipse.ui,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.exchange</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Components Libs Plug-in
|
||||
Bundle-SymbolicName: org.talend.designer.components.libs
|
||||
Bundle-Version: 7.0.2.qualifier
|
||||
Bundle-Version: 7.0.1.qualifier
|
||||
Require-Bundle: org.eclipse.core.runtime
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Vendor: .Talend SA.
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend.libraries</groupId>
|
||||
<artifactId>commons-net-ftps-proxy</artifactId>
|
||||
<version>3.6.1-talend-20190128</version>
|
||||
|
||||
<name>commons-net-talend</name>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>commons-net</groupId>
|
||||
<artifactId>commons-net</artifactId>
|
||||
<version>3.6</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<properties>
|
||||
<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
<snapshotRepository>
|
||||
<id>talend_nexus_deployment</id>
|
||||
<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
<snapshots><enabled>true</enabled></snapshots>
|
||||
<releases><enabled>false</enabled></releases>
|
||||
</snapshotRepository>
|
||||
<repository>
|
||||
<id>talend_nexus_deployment</id>
|
||||
<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
<snapshots><enabled>false</enabled></snapshots>
|
||||
<releases><enabled>true</enabled></releases>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.8.0</version>
|
||||
<configuration>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
@@ -1,309 +0,0 @@
|
||||
package org.talend.ftp;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.OutputStream;
|
||||
import java.net.Inet6Address;
|
||||
import java.net.InetSocketAddress;
|
||||
import java.net.Socket;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import javax.net.ssl.SSLContext;
|
||||
import javax.net.ssl.SSLException;
|
||||
import javax.net.ssl.SSLSocket;
|
||||
|
||||
import org.apache.commons.net.ftp.FTPCmd;
|
||||
import org.apache.commons.net.ftp.FTPReply;
|
||||
import org.apache.commons.net.util.Base64;
|
||||
|
||||
public class HTTPProxyFTPSClient extends SSLSessionReuseFTPSClient {
|
||||
|
||||
/** Default PROT Command */
|
||||
private static final String DEFAULT_PROT = "C";
|
||||
|
||||
private final String proxyHost;
|
||||
|
||||
private final int proxyPort;
|
||||
|
||||
private final String proxyUsername;
|
||||
|
||||
private final String proxyPassword;
|
||||
|
||||
private SSLContext context;
|
||||
|
||||
private String protectionLevel;
|
||||
|
||||
private String tunnelHost; // Save the host when setting up a tunnel (needed for EPSV)
|
||||
|
||||
private static final byte[] CRLF = { '\r', '\n' };
|
||||
|
||||
private final Base64 base64 = new Base64();
|
||||
|
||||
public HTTPProxyFTPSClient(boolean isImplicit, SSLContext context, String proxyHost, int proxyPort, String proxyUser,
|
||||
String proxyPass) {
|
||||
super(isImplicit, context);
|
||||
this.proxyHost = proxyHost;
|
||||
this.proxyPort = proxyPort;
|
||||
this.proxyUsername = proxyUser;
|
||||
this.proxyPassword = proxyPass;
|
||||
this.tunnelHost = null;
|
||||
this.context = context;
|
||||
this.protectionLevel = DEFAULT_PROT;
|
||||
}
|
||||
|
||||
/**
|
||||
* Call execPROT from Parent class and stores current protection level
|
||||
*
|
||||
* @see org.apache.commons.net.ftp.FTPSClient#execPROT(String)
|
||||
*/
|
||||
@Override
|
||||
public void execPROT(String prot) throws SSLException, IOException {
|
||||
super.execPROT(prot);
|
||||
this.protectionLevel = prot;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.apache.commons.net.SocketClient#connect(java.lang.String, int)
|
||||
*/
|
||||
@Override
|
||||
public void connect(String host, int port) throws IOException {
|
||||
|
||||
_socket_ = new Socket(proxyHost, proxyPort);
|
||||
_input_ = _socket_.getInputStream();
|
||||
_output_ = _socket_.getOutputStream();
|
||||
|
||||
try {
|
||||
tunnelHandshake(host, port, _input_, _output_);
|
||||
} catch (Exception e) {
|
||||
throw new IOException("Could not connect to " + host + " using port " + port, e);
|
||||
}
|
||||
|
||||
super._connectAction_();
|
||||
}
|
||||
|
||||
/**
|
||||
* Open ssl socket (if private protection level selected) using tunnel socket
|
||||
*
|
||||
* @see org.apache.commons.net.ftp.FTPSClient#_openDataConnection_(java.lang.String, java.lang.String)
|
||||
*/
|
||||
@Override
|
||||
protected Socket _openDataConnection_(String command, String arg) throws IOException {
|
||||
//Force local passive mode, active mode not supported by through proxy
|
||||
if (getDataConnectionMode() != PASSIVE_LOCAL_DATA_CONNECTION_MODE) {
|
||||
throw new IllegalStateException("Only passive connection mode supported using proxy");
|
||||
}
|
||||
|
||||
final boolean isInet6Address = getRemoteAddress() instanceof Inet6Address;
|
||||
String passiveHost;
|
||||
|
||||
// Try EPSV command first on IPv6 - and IPv4 if enabled.
|
||||
// When using IPv4 with NAT it has the advantage
|
||||
// to work with more rare configurations.
|
||||
// E.g. if FTP server has a static PASV address (external network)
|
||||
// and the client is coming from another internal network.
|
||||
// In that case the data connection after PASV command would fail,
|
||||
// while EPSV would make the client succeed by taking just the port.
|
||||
boolean attemptEPSV = isUseEPSVwithIPv4() || isInet6Address;
|
||||
|
||||
if (attemptEPSV && epsv() == FTPReply.ENTERING_EPSV_MODE) {
|
||||
_parseExtendedPassiveModeReply(_replyLines.get(0));
|
||||
passiveHost = this.tunnelHost;
|
||||
} else {
|
||||
if (isInet6Address) {
|
||||
return null; // Must use EPSV for IPV6
|
||||
}
|
||||
|
||||
// If EPSV failed on IPV4, revert to PASV
|
||||
if (pasv() != FTPReply.ENTERING_PASSIVE_MODE) {
|
||||
return null;
|
||||
}
|
||||
|
||||
_parsePassiveModeReply(_replyLines.get(0));
|
||||
passiveHost = this.getPassiveHost();
|
||||
}
|
||||
|
||||
return DEFAULT_PROT.equals(protectionLevel) ?
|
||||
openPlainDataConnection(passiveHost, command, arg) : openEncryptedDataConnection(passiveHost, command, arg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create, configure and open SSLSocket via plain tunnel Socket
|
||||
* @param passiveHost host returned from ftp server after sending PASV command
|
||||
* @param command to execute
|
||||
* @param arg for command
|
||||
* @return SSLSocket using to Data transmit
|
||||
* @throws IOException
|
||||
*/
|
||||
private Socket openEncryptedDataConnection(String passiveHost, String command, String arg) throws IOException {
|
||||
Socket proxySocket = createTunnelSocket();
|
||||
|
||||
proxySocket.connect(new InetSocketAddress(proxyHost, proxyPort), getConnectTimeout());
|
||||
|
||||
tunnelHandshake(passiveHost, this.getPassivePort(), proxySocket.getInputStream(),
|
||||
proxySocket.getOutputStream());
|
||||
Socket socket = context.getSocketFactory().createSocket(proxySocket, passiveHost, this.getPassivePort(), true);
|
||||
_prepareDataSocket_(socket);
|
||||
|
||||
configureDataSocket(socket);
|
||||
|
||||
if (isRestartOffsetIncorrect()) {
|
||||
proxySocket.close();
|
||||
socket.close();
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!FTPReply.isPositivePreliminary(sendCommand(command, arg))) {
|
||||
proxySocket.close();
|
||||
socket.close();
|
||||
return null;
|
||||
}
|
||||
|
||||
if (socket instanceof SSLSocket) {
|
||||
SSLSocket sslSocket = (SSLSocket) socket;
|
||||
configureSSLDataSocket(sslSocket);
|
||||
sslSocket.startHandshake();
|
||||
}
|
||||
|
||||
return socket;
|
||||
}
|
||||
|
||||
private Socket createTunnelSocket() throws IOException {
|
||||
Socket proxySocket = new Socket();
|
||||
|
||||
configureDataSocket(proxySocket);
|
||||
|
||||
return proxySocket;
|
||||
}
|
||||
|
||||
private void configureSSLDataSocket(SSLSocket sslSocket) {
|
||||
sslSocket.setUseClientMode(getUseClientMode());
|
||||
sslSocket.setEnableSessionCreation(getEnableSessionCreation());
|
||||
|
||||
// server mode
|
||||
if (!getUseClientMode()) {
|
||||
sslSocket.setNeedClientAuth(getNeedClientAuth());
|
||||
sslSocket.setWantClientAuth(getWantClientAuth());
|
||||
}
|
||||
|
||||
if (getEnabledCipherSuites() != null) {
|
||||
sslSocket.setEnabledCipherSuites(getEnabledCipherSuites());
|
||||
}
|
||||
|
||||
if (getEnabledProtocols() != null) {
|
||||
sslSocket.setEnabledProtocols(getEnabledProtocols());
|
||||
}
|
||||
}
|
||||
|
||||
private void configureDataSocket(Socket socket) throws IOException {
|
||||
if (getReceiveDataSocketBufferSize() > 0) {
|
||||
socket.setReceiveBufferSize(getReceiveDataSocketBufferSize());
|
||||
}
|
||||
|
||||
if (getSendDataSocketBufferSize() > 0) {
|
||||
socket.setSendBufferSize(getSendDataSocketBufferSize());
|
||||
}
|
||||
|
||||
if (getPassiveLocalIPAddress() != null) {
|
||||
socket.bind(new InetSocketAddress(getPassiveLocalIPAddress(), 0));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.apache.commons.net.ftp.FTPHTTPClient#_openDataConnection_(FTPCmd, String)
|
||||
* @return Plain Socket using HTTP proxy
|
||||
*/
|
||||
private Socket openPlainDataConnection(String passiveHost, String command, String arg) throws IOException {
|
||||
Socket socket = preparePlainDataTunnelSocket(passiveHost);
|
||||
|
||||
if (isRestartOffsetIncorrect()) {
|
||||
socket.close();
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!FTPReply.isPositivePreliminary(sendCommand(command, arg))) {
|
||||
socket.close();
|
||||
return null;
|
||||
}
|
||||
|
||||
return socket;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create, prepare and connect plain data transmit socket via tunnel proxy
|
||||
*/
|
||||
private Socket preparePlainDataTunnelSocket(String passiveHost) throws IOException {
|
||||
Socket socket = _socketFactory_.createSocket(proxyHost, proxyPort);
|
||||
InputStream is = socket.getInputStream();
|
||||
OutputStream os = socket.getOutputStream();
|
||||
tunnelHandshake(passiveHost, this.getPassivePort(), is, os);
|
||||
|
||||
return socket;
|
||||
}
|
||||
|
||||
/**
|
||||
* HTTP handshake for proxy
|
||||
*/
|
||||
private void tunnelHandshake(String host, int port, InputStream input, OutputStream output) throws IOException {
|
||||
final String connectString = "CONNECT " + host + ":" + port + " HTTP/1.1";
|
||||
final String hostString = "Host: " + host + ":" + port;
|
||||
|
||||
this.tunnelHost = host;
|
||||
output.write(connectString.getBytes(StandardCharsets.UTF_8));
|
||||
output.write(CRLF);
|
||||
output.write(hostString.getBytes(StandardCharsets.UTF_8));
|
||||
output.write(CRLF);
|
||||
|
||||
if (proxyUsername != null && proxyPassword != null) {
|
||||
final String auth = proxyUsername + ":" + proxyPassword;
|
||||
final String header =
|
||||
"Proxy-Authorization: Basic " + base64.encodeToString(auth.getBytes(StandardCharsets.UTF_8));
|
||||
output.write(header.getBytes(StandardCharsets.UTF_8));
|
||||
}
|
||||
|
||||
output.write(CRLF);
|
||||
output.flush();
|
||||
|
||||
List<String> response = new ArrayList<>();
|
||||
BufferedReader reader = new BufferedReader(new InputStreamReader(input, getCharset()));
|
||||
String responseLine;
|
||||
while ((responseLine = reader.readLine()) != null && responseLine.length() > 0) {
|
||||
response.add(responseLine);
|
||||
}
|
||||
|
||||
int size = response.size();
|
||||
|
||||
if (size == 0) {
|
||||
throw new IOException("No response from proxy");
|
||||
}
|
||||
|
||||
String code;
|
||||
String resp = response.get(0);
|
||||
|
||||
if (resp.startsWith("HTTP/") && resp.length() >= 12) {
|
||||
code = resp.substring(9, 12);
|
||||
} else {
|
||||
throw new IOException("Invalid response from proxy: " + resp);
|
||||
}
|
||||
|
||||
if (!"200".equals(code)) {
|
||||
StringBuilder msg = new StringBuilder();
|
||||
msg.append("HTTPTunnelConnector: connection failed\r\n");
|
||||
msg.append("Response received from the proxy:\r\n");
|
||||
|
||||
for (String line : response) {
|
||||
msg.append(line);
|
||||
msg.append("\r\n");
|
||||
}
|
||||
|
||||
throw new IOException(msg.toString());
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isRestartOffsetIncorrect() throws IOException {
|
||||
return (getRestartOffset() > 0) && !restart(getRestartOffset());
|
||||
}
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
package org.talend.ftp;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Method;
|
||||
import java.net.Socket;
|
||||
import java.util.Locale;
|
||||
|
||||
import javax.net.ssl.SSLContext;
|
||||
import javax.net.ssl.SSLSession;
|
||||
import javax.net.ssl.SSLSessionContext;
|
||||
import javax.net.ssl.SSLSocket;
|
||||
|
||||
import org.apache.commons.net.ftp.FTPSClient;
|
||||
|
||||
public class SSLSessionReuseFTPSClient extends FTPSClient {
|
||||
|
||||
public SSLSessionReuseFTPSClient(boolean isImplicit, SSLContext context) {
|
||||
super(isImplicit, context);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void _prepareDataSocket_(final Socket socket) {
|
||||
if (socket instanceof SSLSocket) {
|
||||
final SSLSession session = ((SSLSocket) _socket_).getSession();
|
||||
final SSLSessionContext context = session.getSessionContext();
|
||||
try {
|
||||
final Field sessionHostPortCache = context.getClass().getDeclaredField("sessionHostPortCache");
|
||||
sessionHostPortCache.setAccessible(true);
|
||||
final Object cache = sessionHostPortCache.get(context);
|
||||
final Method putMethod = cache.getClass().getDeclaredMethod("put", Object.class, Object.class);
|
||||
putMethod.setAccessible(true);
|
||||
final Method getHostMethod = socket.getClass().getDeclaredMethod("getHost");
|
||||
getHostMethod.setAccessible(true);
|
||||
Object host = getHostMethod.invoke(socket);
|
||||
final String key =
|
||||
String.format("%s:%s", host, String.valueOf(socket.getPort())).toLowerCase(Locale.ROOT);
|
||||
putMethod.invoke(cache, key, session);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@
|
||||
<groupId>org.talend.libraries</groupId>
|
||||
<artifactId>talend-codegen-utils</artifactId>
|
||||
<!-- release for revert version of library -->
|
||||
<version>0.20.7</version>
|
||||
<version>0.20.4</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<properties>
|
||||
@@ -148,7 +148,6 @@
|
||||
<version>${formatter.plugin.version}</version>
|
||||
<configuration>
|
||||
<configFile>talend_java_eclipse_formatter.xml</configFile>
|
||||
<lineEnding>LF</lineEnding>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
||||
@@ -15,12 +15,6 @@ package org.talend.codegen.enforcer;
|
||||
import java.math.BigDecimal;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.Instant;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.time.ZoneId;
|
||||
import java.time.ZoneOffset;
|
||||
import java.time.temporal.ChronoUnit;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
@@ -389,10 +383,8 @@ public class IncomingSchemaEnforcer {
|
||||
|
||||
if (LogicalTypeUtils.isLogicalDate(fieldSchema)) {
|
||||
// (igonchar): diValue MUST be of java.util.Date
|
||||
// (dchmyga): we need to count days according to OUR date, and not timestamp in UTC.
|
||||
Date diDate = (Date) diValue;
|
||||
OffsetDateTime odt = LocalDateTime.ofInstant(diDate.toInstant(), ZoneId.systemDefault()).atOffset(ZoneOffset.UTC);
|
||||
int avroDays = (int) ChronoUnit.DAYS.between(Instant.EPOCH, odt);
|
||||
int avroDays = (int) (diDate.getTime() / ONE_DAY);
|
||||
currentRecord.put(index, avroDays);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -129,8 +129,6 @@ public class OutgoingDynamicSchemaEnforcer extends OutgoingSchemaEnforcer {
|
||||
this.runtimeFields = runtimeSchema.getFields();
|
||||
this.dynamicFieldsIndexes = ((DynamicIndexMapper) indexMapper).computeDynamicFieldsIndexes(runtimeSchema);
|
||||
createDynamicFieldsSchema();
|
||||
|
||||
firstRecordProcessed = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -15,11 +15,10 @@ package org.talend.codegen.enforcer;
|
||||
import static org.talend.codegen.DiSchemaConstants.TALEND6_COLUMN_TALEND_TYPE;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.time.ZoneId;
|
||||
import java.time.ZonedDateTime;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.TimeZone;
|
||||
|
||||
import org.apache.avro.LogicalType;
|
||||
import org.apache.avro.LogicalTypes;
|
||||
@@ -207,10 +206,10 @@ public class OutgoingSchemaEnforcer implements IndexedRecord {
|
||||
LogicalType logicalType = nonnull.getLogicalType();
|
||||
if (logicalType != null) {
|
||||
if (logicalType == LogicalTypes.date()) {
|
||||
// (dchmyga): we need to set date as number of days at the end of the day in current timezone
|
||||
LocalDate ld = LocalDate.ofEpochDay(((Integer) value).longValue());
|
||||
ZonedDateTime zonedDate = ld.atStartOfDay(ZoneId.systemDefault());
|
||||
return Date.from(zonedDate.toInstant());
|
||||
Calendar c = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
|
||||
c.setTimeInMillis(0L);
|
||||
c.add(Calendar.DATE, (Integer) value);
|
||||
return c.getTime();
|
||||
} else if (logicalType == LogicalTypes.timeMillis()) {
|
||||
return value;
|
||||
} else if (logicalType == LogicalTypes.timestampMillis()) {
|
||||
|
||||
@@ -18,14 +18,12 @@ import static org.hamcrest.Matchers.nullValue;
|
||||
import static org.hamcrest.Matchers.sameInstance;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.assertNull;
|
||||
import static org.junit.Assert.assertThat;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
|
||||
import org.apache.avro.Schema;
|
||||
@@ -429,7 +427,7 @@ public class IncomingSchemaEnforcerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testTypeConversion_toLogicalDate() throws ParseException {
|
||||
public void testTypeConversion_toLogicalDate() {
|
||||
// The expected schema after enforcement.
|
||||
Schema designSchema = SchemaBuilder.builder().record("Record").fields() //
|
||||
.name("field").type(AvroUtils._logicalDate()).noDefault() //
|
||||
@@ -443,12 +441,7 @@ public class IncomingSchemaEnforcerTest {
|
||||
assertThat(enforcer.getRuntimeSchema(), is(designSchema));
|
||||
|
||||
// Put values into the enforcer and get them as an IndexedRecord.
|
||||
// (dchmyga): test is incorrect. We need to test the conversion with a Date value,
|
||||
// which will mean the same date in any time zone
|
||||
// enforcer.put(0, new Date(1234567891011L));
|
||||
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
||||
Date testDate = dateFormat.parse("2009-02-13");
|
||||
enforcer.put(0, testDate);
|
||||
enforcer.put(0, new Date(1234567891011L));
|
||||
IndexedRecord adapted = enforcer.createIndexedRecord();
|
||||
assertThat(adapted.get(0), is((Object) 14288));
|
||||
assertThat(adapted.getSchema(), sameInstance(enforcer.getRuntimeSchema()));
|
||||
|
||||
@@ -17,8 +17,6 @@ import static org.hamcrest.Matchers.hasEntry;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertThat;
|
||||
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -47,15 +45,11 @@ public class OutgoingDynamicSchemaEnforcerTest {
|
||||
*/
|
||||
private static IndexedRecord record;
|
||||
|
||||
private static Date testDate;
|
||||
|
||||
/**
|
||||
* Creates runtime schema and record, which are used in all tests
|
||||
*
|
||||
* @throws ParseException
|
||||
*/
|
||||
@BeforeClass
|
||||
public static void setup() throws ParseException {
|
||||
public static void setup() {
|
||||
runtimeSchema = SchemaBuilder.builder().record("Record").fields() //
|
||||
.name("logicalTime").type(AvroUtils._logicalTime()).noDefault() //
|
||||
.name("logicalDate").type(AvroUtils._logicalDate()).noDefault() //
|
||||
@@ -83,8 +77,6 @@ public class OutgoingDynamicSchemaEnforcerTest {
|
||||
record.put(7, "Main Street");
|
||||
record.put(8, "This is a record with nine columns.");
|
||||
record.put(9, new Date(1467170137872L));
|
||||
|
||||
testDate = new SimpleDateFormat("yyyy-MM-dd").parse("2003-10-20");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -171,7 +163,7 @@ public class OutgoingDynamicSchemaEnforcerTest {
|
||||
Map<String, Object> dynamicValues = (Map<String, Object>) enforcer.get(0);
|
||||
assertThat(dynamicValues.size(), equalTo(7));
|
||||
assertThat(dynamicValues, hasEntry("logicalTime", (Object) 11111));
|
||||
assertThat(dynamicValues, hasEntry("logicalDate", (Object) testDate)); // Mon Oct 20 03:00:00
|
||||
assertThat(dynamicValues, hasEntry("logicalDate", (Object) new Date(1066608000000L))); // Mon Oct 20 03:00:00
|
||||
// EEST 2003 is
|
||||
// 1066608000000 ms
|
||||
assertThat(dynamicValues, hasEntry("logicalTimestamp", (Object) new Date(1489061653L)));
|
||||
@@ -210,7 +202,7 @@ public class OutgoingDynamicSchemaEnforcerTest {
|
||||
Map<String, Object> dynamicValues = (Map<String, Object>) enforcer.get(2);
|
||||
assertThat(dynamicValues.size(), equalTo(7));
|
||||
assertThat(dynamicValues, hasEntry("logicalTime", (Object) 11111));
|
||||
assertThat(dynamicValues, hasEntry("logicalDate", (Object) testDate));
|
||||
assertThat(dynamicValues, hasEntry("logicalDate", (Object) new Date(1066608000000L)));
|
||||
assertThat(dynamicValues, hasEntry("logicalTimestamp", (Object) new Date(1489061653L)));
|
||||
assertThat(dynamicValues, hasEntry("age", (Object) 100));
|
||||
assertThat(dynamicValues, hasEntry("valid", (Object) true));
|
||||
@@ -245,7 +237,7 @@ public class OutgoingDynamicSchemaEnforcerTest {
|
||||
Map<String, Object> dynamicValues = (Map<String, Object>) enforcer.get(3);
|
||||
assertThat(dynamicValues.size(), equalTo(7));
|
||||
assertThat(dynamicValues, hasEntry("logicalTime", (Object) 11111));
|
||||
assertThat(dynamicValues, hasEntry("logicalDate", (Object) testDate));
|
||||
assertThat(dynamicValues, hasEntry("logicalDate", (Object) new Date(1066608000000L)));
|
||||
assertThat(dynamicValues, hasEntry("logicalTimestamp", (Object) new Date(1489061653L)));
|
||||
assertThat(dynamicValues, hasEntry("valid", (Object) true));
|
||||
assertThat(dynamicValues, hasEntry("address", (Object) "Main Street"));
|
||||
|
||||
@@ -5,8 +5,6 @@ import static org.junit.Assert.assertArrayEquals;
|
||||
import static org.junit.Assert.assertThat;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.time.ZoneId;
|
||||
import java.util.Date;
|
||||
|
||||
import org.apache.avro.Schema;
|
||||
@@ -47,7 +45,7 @@ public class OutgoingSchemaEnforcerTest {
|
||||
/**
|
||||
* 1000 days after 1970-01-01, equal to 1972-09-27.
|
||||
*/
|
||||
private static Date DATE_COMPARE = Date.from(LocalDate.ofEpochDay(NUM_DAYS).atStartOfDay(ZoneId.systemDefault()).toInstant());
|
||||
private static Date DATE_COMPARE = new Date(NUM_DAYS * 60 * 60 * 24 * 1000L);
|
||||
|
||||
/**
|
||||
* Creates runtime schema, design schema and record, which is used as test arguments
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.2-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.libs</artifactId>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user