Compare commits
78 Commits
bug/6.2/TD
...
feature/DE
| Author | SHA1 | Date | |
|---|---|---|---|
|
9335d70831 | ||
|
|
9a5d16c730 | ||
|
|
a32215f49e | ||
|
|
fa2e0bf792 | ||
|
|
d68cf06314 | ||
|
|
52b889c93b | ||
|
|
471fe65fb5 | ||
|
|
f79830afa4 | ||
|
|
2785036086 | ||
|
|
d189eab24e | ||
|
|
9030083da6 | ||
|
|
3daf9e5f0d | ||
|
|
975352f4d1 | ||
|
|
6a28240d32 | ||
|
|
ef0be06149 | ||
|
|
68084711fe | ||
|
|
45809b724c | ||
|
|
395d65cd91 | ||
|
|
002620af1a | ||
|
|
d39c7965c7 | ||
|
|
af4d720232 | ||
|
|
52ecbfc03b | ||
|
|
d3da44fd8d | ||
|
|
f1516c6af5 | ||
|
|
e78f603516 | ||
|
|
bb124fb50f | ||
|
|
f66d008093 | ||
|
|
c1edf8739e | ||
|
|
8036d3a70b | ||
|
|
88ff899a5c | ||
|
|
1f87036a23 | ||
|
|
57a21a4c68 | ||
|
|
5559431e2b | ||
|
|
e1424db784 | ||
|
|
5fb5083d4a | ||
|
|
1329d04052 | ||
|
|
f90503a13d | ||
|
|
1cc7c3ced0 | ||
|
|
4af78c5774 | ||
|
|
4e6a6e9355 | ||
|
|
e60f9e2e29 | ||
|
|
d699564c93 | ||
|
|
6d61bcec7f | ||
|
|
81ab388b69 | ||
|
|
1fd71ddb1d | ||
|
|
e9ee1e82d6 | ||
|
|
56527e24d7 | ||
|
|
2dc066ed8b | ||
|
|
be257bb28c | ||
|
|
a347427ca7 | ||
|
|
73e2dad70e | ||
|
|
eaad307550 | ||
|
|
6770adb4f9 | ||
|
|
32e94c9217 | ||
|
|
78f2702a29 | ||
|
|
67f1e3cc1d | ||
|
|
6cf871d4f3 | ||
|
|
8755b5e6a3 | ||
|
|
7c792f39fa | ||
|
|
1fcf4e7c0f | ||
|
|
3e72b82a88 | ||
|
|
b6fd567eff | ||
|
|
a85f4ad0c8 | ||
|
|
1801f8b275 | ||
|
|
8470530b95 | ||
|
|
4b4f3c56f9 | ||
|
|
4400c1b718 | ||
|
|
f75ac43984 | ||
|
|
145675f4f7 | ||
|
|
24013fc53d | ||
|
|
e671f595d7 | ||
|
|
4b66e8fae9 | ||
|
|
5d87878b66 | ||
|
|
51e3094fa3 | ||
|
|
6232da600d | ||
|
|
f856c937be | ||
|
|
5d5449c099 | ||
|
|
50d3b0a43f |
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.componentdesigner.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.componentdesigner.rcp.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.abstractmap.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.alfrescooutput.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.business.diagram.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.codegen.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.exchange.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.core.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.dbmap.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.documentation.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.fileoutputxml.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.gefabstractmap.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.hl7.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.mapper.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.job.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.rowgenerator.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.runprocess.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.scd.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.webservice.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.xmlmap.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.expressionbuilder.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.ftp.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.json.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.view.di.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.sbi.engines.client.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.spagic.engines.client.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.sqlbuilder.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.componentdesigner.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.business.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.branding.tos.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.sbi.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.spagic.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.components.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.libraries.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.componentdesigner.rcp</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.componentdesigner</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.abstractmap</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.alfrescooutput</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.business.diagram</artifactId>
|
||||
|
||||
@@ -51,7 +51,7 @@ if(def instanceof org.talend.components.api.component.InputComponentDefinition){
|
||||
%>
|
||||
if(resultMap_<%=cid%>!=null) {
|
||||
for(java.util.Map.Entry<String,Object> entry_<%=cid%> : resultMap_<%=cid%>.entrySet()) {
|
||||
switch(entry_<%=cid%>.getKey()) {//for the old key
|
||||
switch(entry_<%=cid%>.getKey()) {
|
||||
case org.talend.components.api.component.ComponentDefinition.RETURN_ERROR_MESSAGE :
|
||||
container_<%=cid%>.setComponentData("<%=cid%>", "ERROR_MESSAGE", entry_<%=cid%>.getValue());
|
||||
break;
|
||||
@@ -64,9 +64,17 @@ if(resultMap_<%=cid%>!=null) {
|
||||
case org.talend.components.api.component.ComponentDefinition.RETURN_REJECT_RECORD_COUNT :
|
||||
container_<%=cid%>.setComponentData("<%=cid%>", "NB_REJECT", entry_<%=cid%>.getValue());
|
||||
break;
|
||||
default :
|
||||
StringBuilder studio_key_<%=cid%> = new StringBuilder();
|
||||
for (int i_<%=cid%> = 0; i_<%=cid%> < entry_<%=cid%>.getKey().length(); i_<%=cid%>++) {
|
||||
char ch_<%=cid%> = entry_<%=cid%>.getKey().charAt(i_<%=cid%>);
|
||||
if(Character.isUpperCase(ch_<%=cid%>) && i_<%=cid%>> 0) {
|
||||
studio_key_<%=cid%>.append('_');
|
||||
}
|
||||
studio_key_<%=cid%>.append(ch_<%=cid%>);
|
||||
}
|
||||
container_<%=cid%>.setComponentData("<%=cid%>", studio_key_<%=cid%>.toString().toUpperCase(java.util.Locale.ENGLISH), entry_<%=cid%>.getValue());
|
||||
break;
|
||||
}
|
||||
|
||||
//for the new key
|
||||
container_<%=cid%>.setComponentData("<%=cid%>", entry_<%=cid%>.getKey(), entry_<%=cid%>.getValue());
|
||||
}
|
||||
}
|
||||
@@ -139,22 +139,27 @@ if(def instanceof org.talend.components.api.component.OutputComponentDefinition)
|
||||
<%
|
||||
if (mainIrToRow != null) {
|
||||
%>
|
||||
<%=mainIrToRow.getConnection().getName()%> = new <%=mainIrToRow.getConnection().getName() %>Struct();
|
||||
java.util.Iterator<?> outgoingMainRecords_<%=cid%> = ((org.talend.components.api.component.runtime.WriterWithFeedback<?, ?, ?>)writer_<%=cid%>).getSuccessfulWrites().iterator();
|
||||
Object outgoingMain_<%=cid%> = null;
|
||||
if (outgoingMainRecords_<%=cid%>.hasNext()) {
|
||||
outgoingMain_<%=cid%> = outgoingMainRecords_<%=cid%>.next();
|
||||
if(outgoingMainRecords_<%=cid%>.hasNext()){
|
||||
outgoingMain_<%=cid%> = data_<%=cid%>;
|
||||
}
|
||||
}
|
||||
<%
|
||||
if (rejectIrToRow == null) {
|
||||
%>
|
||||
if(outgoingMain_<%=cid%> == null){
|
||||
else{
|
||||
if (!((org.talend.components.api.component.runtime.WriterWithFeedback<?, ?, ?>)writer_<%=cid%>).getRejectedWrites().iterator().hasNext()) {
|
||||
outgoingMain_<%=cid%> = data_<%=cid%>;
|
||||
}
|
||||
}
|
||||
<%
|
||||
}
|
||||
%>
|
||||
if(outgoingMain_<%=cid%>!=null){
|
||||
<%=mainIrToRow.getConnection().getName()%> = new <%=mainIrToRow.getConnection().getName() %>Struct();
|
||||
<%
|
||||
mainIrToRow.generateConvertRecord("outgoingMain_" + cid, mainIrToRow.getConnection().getName());
|
||||
%>
|
||||
|
||||
@@ -118,27 +118,52 @@ class IndexedRecordToRowStructGenerator {
|
||||
dynamicMetadata_<%=cid%>.setName(childDynamic_<%=cid%>.name());
|
||||
dynamicMetadata_<%=cid%>.setDbName(childDynamic_<%=cid%>.name());
|
||||
String talendType_<%=cid%> = null;
|
||||
if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.ARRAY) {
|
||||
org.apache.avro.Schema.Type type_<%=cid%> = childDynamic_<%=cid%>.schema().getType();
|
||||
if(type_<%=cid%> == org.apache.avro.Schema.Type.UNION){
|
||||
java.util.List<org.apache.avro.Schema> fieldTypes_<%=cid%> = childDynamic_<%=cid%>.schema().getTypes();
|
||||
for(org.apache.avro.Schema fieldType_<%=cid%>:fieldTypes_<%=cid%>){
|
||||
if(fieldType_<%=cid%>.getType() == org.apache.avro.Schema.Type.NULL){
|
||||
dynamicMetadata_<%=cid%>.setNullable(true);
|
||||
}else{
|
||||
type_<%=cid%> = fieldType_<%=cid%>.getType();
|
||||
}
|
||||
}
|
||||
}
|
||||
if (type_<%=cid%> == org.apache.avro.Schema.Type.ARRAY) {
|
||||
talendType_<%=cid%> = "<%=JavaTypesManager.LIST.getId()%>";
|
||||
} else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.BOOLEAN) {
|
||||
} else if (type_<%=cid%> == org.apache.avro.Schema.Type.BOOLEAN) {
|
||||
talendType_<%=cid%> = "<%=JavaTypesManager.BOOLEAN.getId()%>";
|
||||
} else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.BYTES) {
|
||||
} else if (type_<%=cid%> == org.apache.avro.Schema.Type.BYTES) {
|
||||
talendType_<%=cid%> = "<%=JavaTypesManager.BYTE_ARRAY.getId()%>";
|
||||
} else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.FIXED) {
|
||||
} else if (type_<%=cid%> == org.apache.avro.Schema.Type.FIXED) {
|
||||
talendType_<%=cid%> = "<%=JavaTypesManager.BYTE_ARRAY.getId()%>";
|
||||
} else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.DOUBLE) {
|
||||
} else if (type_<%=cid%> == org.apache.avro.Schema.Type.DOUBLE) {
|
||||
talendType_<%=cid%> = "<%=JavaTypesManager.DOUBLE.getId()%>";
|
||||
} else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.FLOAT) {
|
||||
} else if (type_<%=cid%> == org.apache.avro.Schema.Type.FLOAT) {
|
||||
talendType_<%=cid%> = "<%=JavaTypesManager.FLOAT.getId()%>";
|
||||
} else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.INT) {
|
||||
} else if (type_<%=cid%> == org.apache.avro.Schema.Type.INT) {
|
||||
talendType_<%=cid%> = "<%=JavaTypesManager.INTEGER.getId()%>";
|
||||
} else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.LONG) {
|
||||
talendType_<%=cid%> = "<%=JavaTypesManager.LONG.getId()%>";
|
||||
} else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.ENUM) {
|
||||
} else if (type_<%=cid%> == org.apache.avro.Schema.Type.LONG) {
|
||||
String pattern_<%=cid%> = childDynamic_<%=cid%>.getProp(org.talend.daikon.di.DiSchemaConstants.TALEND6_COLUMN_PATTERN);
|
||||
if(pattern_<%=cid%>!=null && !pattern_<%=cid%>.trim().isEmpty()){
|
||||
talendType_<%=cid%> = "<%=JavaTypesManager.DATE.getId()%>";
|
||||
dynamicMetadata_<%=cid%>.setFormat(pattern_<%=cid%>);
|
||||
}else{
|
||||
talendType_<%=cid%> = "<%=JavaTypesManager.LONG.getId()%>";
|
||||
}
|
||||
} else if (type_<%=cid%> == org.apache.avro.Schema.Type.ENUM) {
|
||||
talendType_<%=cid%> = "<%=JavaTypesManager.STRING.getId()%>";
|
||||
} else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.STRING) {
|
||||
} else if (type_<%=cid%> == org.apache.avro.Schema.Type.STRING) {
|
||||
talendType_<%=cid%> = "<%=JavaTypesManager.STRING.getId()%>";
|
||||
}
|
||||
Object length_<%=cid%> = childDynamic_<%=cid%>.getProp(org.talend.daikon.di.DiSchemaConstants.TALEND6_COLUMN_LENGTH);
|
||||
if(length_<%=cid%> != null){
|
||||
dynamicMetadata_<%=cid%>.setLength(Integer.parseInt(String.valueOf(length_<%=cid%>)));
|
||||
}
|
||||
Object precision_<%=cid%> = childDynamic_<%=cid%>.getProp(org.talend.daikon.di.DiSchemaConstants.TALEND6_COLUMN_PRECISION);
|
||||
if(precision_<%=cid%> != null){
|
||||
dynamicMetadata_<%=cid%>.setPrecision(Integer.parseInt(String.valueOf(precision_<%=cid%>)));
|
||||
}
|
||||
dynamicMetadata_<%=cid%>.setType(talendType_<%=cid%>);
|
||||
<%=codeVarDynamic%>.metadatas.add(dynamicMetadata_<%=cid%>);
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.codegen</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.exchange</artifactId>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
<groupId>org.talend.libraries</groupId>
|
||||
<artifactId>talend-marketo-rest</artifactId>
|
||||
<version>1.0-20150911</version>
|
||||
<version>2.0-20160622</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>talend-marketo-rest</name>
|
||||
|
||||
@@ -81,14 +81,13 @@ public class MarketoRestClient {
|
||||
throws Exception {
|
||||
if (authInfo != null) {
|
||||
webClient.resetQuery();
|
||||
webClient.replacePath("/identity/oauth/token")
|
||||
.query("grant_type", "client_credentials")
|
||||
.query("client_id", authInfo.getClientAccessID())
|
||||
.query("client_secret", authInfo.getSecretKey());
|
||||
webClient.replacePath("/identity/oauth/token");
|
||||
webClient.type(MediaType.APPLICATION_FORM_URLENCODED_TYPE);
|
||||
|
||||
Response response = webClient.get();
|
||||
Response response = webClient.post("grant_type=client_credentials&client_secret=" + authInfo.getSecretKey()
|
||||
+ "&client_id=" + authInfo.getClientAccessID());
|
||||
if (response.getStatus() == 200 && response.hasEntity()) {
|
||||
|
||||
webClient.type(MediaType.APPLICATION_JSON_TYPE);
|
||||
InputStream inStream = response.readEntity(InputStream.class);
|
||||
Reader reader = new InputStreamReader(inStream);
|
||||
Gson gson = new Gson();
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.libs</artifactId>
|
||||
|
||||
@@ -209,7 +209,7 @@ if(sizeOps>0){ // T_OutBegin_AggR_114
|
||||
public void checkedIADD(byte a, byte b, boolean checkTypeOverFlow, boolean checkUlp) {
|
||||
byte r = (byte) (a + b);
|
||||
if (checkTypeOverFlow && ((a ^ r) & (b ^ r)) < 0) {
|
||||
throw new RuntimeException(buildOverflowMessage(String.valueOf(a), String.valueOf(b), "'short/Short'", "'int/Integer'"));
|
||||
throw new RuntimeException(buildOverflowMessage(String.valueOf(a), String.valueOf(b), "'short/Short'", "'byte/Byte'"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -737,7 +737,7 @@ if(warnings.size() > 0) {
|
||||
%>
|
||||
AggOperationStruct_<%=cid %> operation_result_<%=cid %> = null;
|
||||
AggOperationStruct_<%=cid %> operation_finder_<%=cid %> = new AggOperationStruct_<%=cid %>();
|
||||
java.util.Map<AggOperationStruct_<%=cid %>,AggOperationStruct_<%=cid %>> hash_<%=cid %> = new java.util.LinkedHashMap<AggOperationStruct_<%=cid %>,AggOperationStruct_<%=cid %>>();
|
||||
java.util.Map<AggOperationStruct_<%=cid %>,AggOperationStruct_<%=cid %>> hash_<%=cid %> = new java.util.HashMap<AggOperationStruct_<%=cid %>,AggOperationStruct_<%=cid %>>();
|
||||
<%
|
||||
|
||||
if(listFlag){ // G_OutBegin_AggR_192
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
HELP=org.talend.help.tAmazonEMRManage
|
||||
LONG_NAME=Allows to start or stop Amazon EMR.
|
||||
LONG_NAME=Allows you to list the details about the instance groups in a cluster on Amazon EMR.
|
||||
|
||||
AUTHENTICATION.NAME=Authentication
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
HELP=org.talend.help.tAmazonEMRManage
|
||||
LONG_NAME=Allows to start or stop Amazon EMR.
|
||||
LONG_NAME=Allows you to resize a task instance group on Amazon EMR.
|
||||
|
||||
AUTHENTICATION.NAME=Authentication
|
||||
|
||||
|
||||
@@ -678,7 +678,7 @@
|
||||
|
||||
<CODEGENERATION>
|
||||
<IMPORTS>
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc.jar" MVN="mvn:org.talend.libraries/db2jcc/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc4.jar" MVN="mvn:org.talend.libraries/db2jcc/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc_license_cu.jar" MVN="mvn:org.talend.libraries/db2jcc_license_cu/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc_license_cisuz.jar" MVN="mvn:org.talend.libraries/db2jcc_license_cisuz/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="commons-io-2.4" MODULE="commons-io-2.4.jar" MVN="mvn:org.talend.libraries/commons-io-2.4/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-io-2.4.jar" REQUIRED="true" />
|
||||
|
||||
@@ -197,7 +197,7 @@
|
||||
|
||||
<CODEGENERATION>
|
||||
<IMPORTS>
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc.jar" MVN="mvn:org.talend.libraries/db2jcc/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc4.jar" MVN="mvn:org.talend.libraries/db2jcc/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc_license_cu.jar" MVN="mvn:org.talend.libraries/db2jcc_license_cu/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc_license_cisuz.jar" MVN="mvn:org.talend.libraries/db2jcc_license_cisuz/6.0.0" REQUIRED="true" />
|
||||
</IMPORTS>
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
</ADVANCED_PARAMETERS>
|
||||
<CODEGENERATION>
|
||||
<IMPORTS>
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc.jar" MVN="mvn:org.talend.libraries/db2jcc/6.0.0"
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc4.jar" MVN="mvn:org.talend.libraries/db2jcc/6.0.0"
|
||||
REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc_license_cu.jar" MVN="mvn:org.talend.libraries/db2jcc_license_cu/6.0.0"
|
||||
REQUIRED="true" />
|
||||
|
||||
@@ -388,7 +388,7 @@
|
||||
|
||||
<CODEGENERATION>
|
||||
<IMPORTS>
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc.jar" MVN="mvn:org.talend.libraries/db2jcc/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc4.jar" MVN="mvn:org.talend.libraries/db2jcc/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc_license_cu.jar" MVN="mvn:org.talend.libraries/db2jcc_license_cu/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc_license_cisuz.jar" MVN="mvn:org.talend.libraries/db2jcc_license_cisuz/6.0.0" REQUIRED="true" />
|
||||
</IMPORTS>
|
||||
|
||||
@@ -299,7 +299,7 @@
|
||||
|
||||
<CODEGENERATION>
|
||||
<IMPORTS>
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc.jar" MVN="mvn:org.talend.libraries/db2jcc/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc4.jar" MVN="mvn:org.talend.libraries/db2jcc/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc_license_cu.jar" MVN="mvn:org.talend.libraries/db2jcc_license_cu/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc_license_cisuz.jar" MVN="mvn:org.talend.libraries/db2jcc_license_cisuz/6.0.0" REQUIRED="true" />
|
||||
</IMPORTS>
|
||||
|
||||
@@ -507,7 +507,7 @@
|
||||
|
||||
<CODEGENERATION>
|
||||
<IMPORTS>
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc.jar" MVN="mvn:org.talend.libraries/db2jcc/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc4.jar" MVN="mvn:org.talend.libraries/db2jcc/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc_license_cu.jar" MVN="mvn:org.talend.libraries/db2jcc_license_cu/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc_license_cisuz.jar" MVN="mvn:org.talend.libraries/db2jcc_license_cisuz/6.0.0" REQUIRED="true" />
|
||||
</IMPORTS>
|
||||
|
||||
@@ -365,7 +365,7 @@
|
||||
|
||||
<CODEGENERATION>
|
||||
<IMPORTS>
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc.jar" MVN="mvn:org.talend.libraries/db2jcc/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc4.jar" MVN="mvn:org.talend.libraries/db2jcc/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc_license_cu.jar" MVN="mvn:org.talend.libraries/db2jcc_license_cu/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc_license_cisuz.jar" MVN="mvn:org.talend.libraries/db2jcc_license_cisuz/6.0.0" REQUIRED="true" />
|
||||
</IMPORTS>
|
||||
|
||||
@@ -239,7 +239,7 @@
|
||||
|
||||
<CODEGENERATION>
|
||||
<IMPORTS>
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc.jar" MVN="mvn:org.talend.libraries/db2jcc/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc4.jar" MVN="mvn:org.talend.libraries/db2jcc/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc_license_cu.jar" MVN="mvn:org.talend.libraries/db2jcc_license_cu/6.0.0" REQUIRED="true" />
|
||||
<IMPORT NAME="Driver-DB2" MODULE="db2jcc_license_cisuz.jar" MVN="mvn:org.talend.libraries/db2jcc_license_cisuz/6.0.0" REQUIRED="true" />
|
||||
</IMPORTS>
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
</ADVANCED_PARAMETERS>
|
||||
<CODEGENERATION>
|
||||
<IMPORTS>
|
||||
<IMPORT MODULE="janet-java-1.2.jar" MVN="mvn:org.talend.libraries/janet-java-1.2/6.0.0" NAME="janet-java-1.2"
|
||||
<IMPORT MODULE="janet-java-1.1.jar" MVN="mvn:org.talend.libraries/janet-java-1.1/6.0.0" NAME="janet-java-1.1"
|
||||
REQUIRED="true" />
|
||||
</IMPORTS>
|
||||
</CODEGENERATION>
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
</ADVANCED_PARAMETERS>
|
||||
<CODEGENERATION>
|
||||
<IMPORTS>
|
||||
<IMPORT MODULE="janet-java-1.2.jar" MVN="mvn:org.talend.libraries/janet-java-1.2/6.0.0" NAME="janet-java-1.2"
|
||||
<IMPORT MODULE="janet-java-1.1.jar" MVN="mvn:org.talend.libraries/janet-java-1.1/6.0.0" NAME="janet-java-1.1"
|
||||
REQUIRED="true" />
|
||||
</IMPORTS>
|
||||
</CODEGENERATION>
|
||||
|
||||
@@ -223,7 +223,6 @@ if (sftp) { // *** sftp *** //
|
||||
}
|
||||
<%=outputConnName %>.md5 =String.format("%032x", new java.math.BigInteger(1, dgs_<%=cid %>.digest()));
|
||||
<%if(isLog4jEnabled){%>
|
||||
log4jSb_<%=cid%>.append();
|
||||
log.info("<%= cid %> - md5 message is : '"+ <%=outputConnName %>.md5 + "'.");
|
||||
<%}%>
|
||||
is_<%=cid %>.close();
|
||||
|
||||
@@ -81,3 +81,9 @@
|
||||
}
|
||||
}
|
||||
%>
|
||||
|
||||
<%if(!useStream && isDeleteEmptyFile){%>
|
||||
if(isFileGenerated_<%=cid %> && nb_line_<%=cid %> == 0){
|
||||
createFile<%=cid%>.delete();
|
||||
}
|
||||
<%}%>
|
||||
|
||||
@@ -29,23 +29,7 @@
|
||||
<CONNECTORS>
|
||||
<CONNECTOR CTYPE="FLOW" MAX_INPUT="1" MAX_OUTPUT="1"/>
|
||||
<CONNECTOR NAME="REJECT" CTYPE="FLOW" MAX_INPUT="0" MAX_OUTPUT="1" LINE_STYLE="2" COLOR="FF0000" BASE_SCHEMA="FLOW"
|
||||
NOT_SHOW_IF="(
|
||||
(
|
||||
((DATA_ACTION == 'INSERT') AND (USE_BATCH_SIZE == 'true'))
|
||||
OR ((DATA_ACTION == 'UPDATE') AND (USE_BATCH_SIZE == 'true'))
|
||||
OR ((DATA_ACTION == 'DELETE') AND (USE_BATCH_SIZE == 'true'))
|
||||
)
|
||||
OR (DIE_ON_ERROR == 'true')
|
||||
)
|
||||
OR
|
||||
(
|
||||
(
|
||||
((DATA_ACTION == 'INSERT') AND (USE_BATCH_AND_USE_CONN == 'true'))
|
||||
OR ((DATA_ACTION == 'UPDATE') AND (USE_BATCH_AND_USE_CONN == 'true'))
|
||||
OR ((DATA_ACTION == 'DELETE') AND (USE_BATCH_AND_USE_CONN == 'true'))
|
||||
)
|
||||
OR (DIE_ON_ERROR == 'true')
|
||||
)"/>
|
||||
NOT_SHOW_IF="(DIE_ON_ERROR == 'true') OR (isShow[BATCH_SIZE])"/>
|
||||
<CONNECTOR CTYPE="ITERATE" MAX_OUTPUT="0" MAX_INPUT="0"/>
|
||||
<CONNECTOR CTYPE="SUBJOB_OK" MAX_INPUT="1" />
|
||||
<CONNECTOR CTYPE="SUBJOB_ERROR" MAX_INPUT="1" />
|
||||
|
||||
@@ -66,11 +66,11 @@ int nb_line_<%=cid %> = 0;
|
||||
context_<%=cid %>.put(javax.xml.ws.BindingProvider.PASSWORD_PROPERTY, password_<%=cid %>);
|
||||
<% logUtil.debug("\"Got service successfully with key=\" + connKey_" + cid);%>
|
||||
|
||||
if((boolean)globalMap.get("useTransaction_<%=connection %>")) {
|
||||
if((Boolean)globalMap.get("useTransaction_<%=connection %>")) {
|
||||
String turl_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getMDMTransactionURL(murl_<%=cid %>, true);
|
||||
com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
|
||||
if(mdmTransaction_<%=cid %> == null){
|
||||
if((boolean)globalMap.get("useClientTranId_<%=connection %>")){
|
||||
if((Boolean)globalMap.get("useClientTranId_<%=connection %>")){
|
||||
String sessionID_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
|
||||
mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
|
||||
mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
|
||||
|
||||
@@ -134,11 +134,11 @@ int nb_line_rejected_<%=cid %> = 0;
|
||||
context_<%=cid %>.put(javax.xml.ws.BindingProvider.PASSWORD_PROPERTY, password_<%=cid %>);
|
||||
<% logUtil.debug("\"Got service successfully with key=\" + connKey_" + cid);%>
|
||||
|
||||
if((boolean)globalMap.get("useTransaction_<%=connection %>")) {
|
||||
if((Boolean)globalMap.get("useTransaction_<%=connection %>")) {
|
||||
String turl_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getMDMTransactionURL(murl_<%=cid %>, true);
|
||||
com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
|
||||
if(mdmTransaction_<%=cid %> == null){
|
||||
if((boolean)globalMap.get("useClientTranId_<%=connection %>")){
|
||||
if((Boolean)globalMap.get("useClientTranId_<%=connection %>")){
|
||||
String sessionID_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
|
||||
mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
|
||||
mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
|
||||
|
||||
@@ -109,11 +109,11 @@ if ((metadatas != null) && (metadatas.size() > 0)) {//1
|
||||
context_<%=cid %>.put(javax.xml.ws.BindingProvider.PASSWORD_PROPERTY, password_<%=cid %>);
|
||||
<% logUtil.debug("\"Got service successfully with key=\" + connKey_" + cid);%>
|
||||
|
||||
if((boolean)globalMap.get("useTransaction_<%=connection %>")) {
|
||||
if((Boolean)globalMap.get("useTransaction_<%=connection %>")) {
|
||||
String turl_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getMDMTransactionURL(murl_<%=cid %>, true);
|
||||
com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
|
||||
if(mdmTransaction_<%=cid %> == null){
|
||||
if((boolean)globalMap.get("useClientTranId_<%=connection %>")){
|
||||
if((Boolean)globalMap.get("useClientTranId_<%=connection %>")){
|
||||
String sessionID_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
|
||||
mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
|
||||
mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
|
||||
@@ -247,8 +247,10 @@ if ((metadatas != null) && (metadatas.size() > 0)) {//1
|
||||
|
||||
boolean continueFlag_<%=cid %> = true;
|
||||
int totalCount_<%=cid %> = -1;<%//For TDI-26039%>
|
||||
int totalPage_<%=cid %> = -1;
|
||||
int pageNumber_<%=cid %> = 0;
|
||||
while (continueFlag_<%=cid %>) {
|
||||
|
||||
pageNumber_<%=cid %>++;
|
||||
getitems_<%=cid %>=new org.talend.mdm.webservice.WSGetItems(
|
||||
<%=concept%>,
|
||||
readRecordsSize_<%=cid %>,
|
||||
@@ -267,6 +269,7 @@ if ((metadatas != null) && (metadatas.size() > 0)) {//1
|
||||
if(totalCount_<%=cid %> < 0){
|
||||
totalCount_<%=cid %> = Integer.valueOf(items_<%=cid %>[0].replaceAll("<totalCount>", "").replaceAll("</totalCount>", ""));
|
||||
<% logUtil.info("\"Total items retrieved:\"+totalCount_"+cid);%>
|
||||
totalPage_<%=cid %> = totalCount_<%=cid %>/recordsPerPage_<%=cid %> +1;
|
||||
}
|
||||
} catch(java.lang.Exception e) {
|
||||
<% logUtil.error("\"Unexpected error:\"+e.getMessage()");%>
|
||||
@@ -277,7 +280,7 @@ if ((metadatas != null) && (metadatas.size() > 0)) {//1
|
||||
<% } %>
|
||||
}
|
||||
retrievedCount_<%=cid %> += (items_<%=cid %>.length - 1);
|
||||
if (totalCount_<%=cid %> == retrievedCount_<%=cid %> || recordsPerPage_<%=cid %> == -1 || (items_<%=cid %>.length - 1) < readRecordsSize_<%=cid %> || limit_<%=cid %> == retrievedCount_<%=cid %>) {
|
||||
if (totalCount_<%=cid %> == retrievedCount_<%=cid %> || recordsPerPage_<%=cid %> == -1 || (items_<%=cid %>.length - 1) < 1 || pageNumber_<%=cid %> == totalPage_<%=cid %> || limit_<%=cid %> == retrievedCount_<%=cid %>) {
|
||||
continueFlag_<%=cid %> = false;
|
||||
} else if (limit_<%=cid %> != -1 && limit_<%=cid %> < retrievedCount_<%=cid %> + readRecordsSize_<%=cid %>) {
|
||||
readRecordsSize_<%=cid %> = limit_<%=cid %> - retrievedCount_<%=cid %>;
|
||||
|
||||
@@ -71,11 +71,11 @@ int nb_line_<%=cid %> = 0;
|
||||
context_<%=cid %>.put(javax.xml.ws.BindingProvider.PASSWORD_PROPERTY, password_<%=cid %>);
|
||||
<% logUtil.debug("\"Got service successfully with key=\" + connKey_" + cid);%>
|
||||
|
||||
if((boolean)globalMap.get("useTransaction_<%=connection %>")) {
|
||||
if((Boolean)globalMap.get("useTransaction_<%=connection %>")) {
|
||||
String turl_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getMDMTransactionURL(murl_<%=cid %>, true);
|
||||
com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
|
||||
if(mdmTransaction_<%=cid %> == null){
|
||||
if((boolean)globalMap.get("useClientTranId_<%=connection %>")){
|
||||
if((Boolean)globalMap.get("useClientTranId_<%=connection %>")){
|
||||
String sessionID_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
|
||||
mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
|
||||
mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
|
||||
|
||||
@@ -64,11 +64,11 @@ int nb_line_<%=cid %> = 0;
|
||||
context_<%=cid %>.put(javax.xml.ws.BindingProvider.PASSWORD_PROPERTY, password_<%=cid %>);
|
||||
<% logUtil.debug("\"Got service successfully with key=\" + connKey_" + cid);%>
|
||||
|
||||
if((boolean)globalMap.get("useTransaction_<%=connection %>")) {
|
||||
if((Boolean)globalMap.get("useTransaction_<%=connection %>")) {
|
||||
String turl_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getMDMTransactionURL(murl_<%=cid %>, true);
|
||||
com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
|
||||
if(mdmTransaction_<%=cid %> == null){
|
||||
if((boolean)globalMap.get("useClientTranId_<%=connection %>")){
|
||||
if((Boolean)globalMap.get("useClientTranId_<%=connection %>")){
|
||||
String sessionID_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
|
||||
mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
|
||||
mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
|
||||
|
||||
@@ -107,11 +107,11 @@ if ((metadatas != null) && (metadatas.size() > 0)) {
|
||||
context_<%=cid %>.put(javax.xml.ws.BindingProvider.PASSWORD_PROPERTY, password_<%=cid %>);
|
||||
<% logUtil.debug("\"Got service successfully with key=\" + connKey_" + cid);%>
|
||||
|
||||
if((boolean)globalMap.get("useTransaction_<%=connection %>")) {
|
||||
if((Boolean)globalMap.get("useTransaction_<%=connection %>")) {
|
||||
String turl_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getMDMTransactionURL(murl_<%=cid %>, true);
|
||||
com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
|
||||
if(mdmTransaction_<%=cid %> == null){
|
||||
if((boolean)globalMap.get("useClientTranId_<%=connection %>")){
|
||||
if((Boolean)globalMap.get("useClientTranId_<%=connection %>")){
|
||||
String sessionID_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
|
||||
mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
|
||||
mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
|
||||
|
||||
@@ -138,11 +138,11 @@ int nb_line_rejected_<%=cid %> = 0;
|
||||
context_<%=cid %>.put(javax.xml.ws.BindingProvider.PASSWORD_PROPERTY, password_<%=cid %>);
|
||||
<% logUtil.debug("\"Got service successfully with key=\" + connKey_" + cid);%>
|
||||
|
||||
if((boolean)globalMap.get("useTransaction_<%=connection %>")) {
|
||||
if((Boolean)globalMap.get("useTransaction_<%=connection %>")) {
|
||||
String turl_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getMDMTransactionURL(murl_<%=cid %>, true);
|
||||
com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
|
||||
if(mdmTransaction_<%=cid %> == null){
|
||||
if((boolean)globalMap.get("useClientTranId_<%=connection %>")){
|
||||
if((Boolean)globalMap.get("useClientTranId_<%=connection %>")){
|
||||
String sessionID_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
|
||||
mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
|
||||
mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
|
||||
|
||||
@@ -246,7 +246,7 @@
|
||||
<IMPORT NAME="XMLSCHEMA-CORE" MODULE="xmlschema-core-2.2.1.jar" MVN="mvn:org.talend.libraries/xmlschema-core-2.2.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/xmlschema-core-2.2.1.jar" REQUIRED_IF="(USE_REST_API == 'true')"/>
|
||||
<IMPORT NAME="WOODSTOX-CORE-ASL" MODULE="woodstox-core-asl-4.4.1.jar" MVN="mvn:org.talend.libraries/woodstox-core-asl-4.4.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/woodstox-core-asl-4.4.1.jar" REQUIRED_IF="(USE_REST_API == 'true')"/>
|
||||
<IMPORT NAME="GSON" MODULE="gson-2.3.1.jar" MVN="mvn:org.talend.libraries/gson-2.3.1/6.1.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/gson-2.3.1.jar" REQUIRED_IF="(USE_REST_API == 'true')"/>
|
||||
<IMPORT NAME="TALEND-MARKETO-REST" MODULE="talend-marketo-rest-1.0-20150911.jar" MVN="mvn:org.talend.libraries/talend-marketo-rest-1.0-20150911/6.1.0" REQUIRED_IF="(USE_REST_API == 'true')" />
|
||||
<IMPORT NAME="TALEND-MARKETO-REST" MODULE="talend-marketo-rest-2.0-20160622.jar" MVN="mvn:org.talend.libraries/talend-marketo-rest-2.0-20160622/6.2.1" REQUIRED_IF="(USE_REST_API == 'true')" />
|
||||
|
||||
</IMPORTS>
|
||||
</CODEGENERATION>
|
||||
|
||||
@@ -580,7 +580,7 @@
|
||||
<IMPORT NAME="XMLSCHEMA-CORE" MODULE="xmlschema-core-2.2.1.jar" MVN="mvn:org.talend.libraries/xmlschema-core-2.2.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/xmlschema-core-2.2.1.jar" REQUIRED_IF="(USE_REST_API == 'true')"/>
|
||||
<IMPORT NAME="WOODSTOX-CORE-ASL" MODULE="woodstox-core-asl-4.4.1.jar" MVN="mvn:org.talend.libraries/woodstox-core-asl-4.4.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/woodstox-core-asl-4.4.1.jar" REQUIRED_IF="(USE_REST_API == 'true')"/>
|
||||
<IMPORT NAME="GSON" MODULE="gson-2.3.1.jar" MVN="mvn:org.talend.libraries/gson-2.3.1/6.1.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/gson-2.3.1.jar" REQUIRED_IF="(USE_REST_API == 'true')"/>
|
||||
<IMPORT NAME="TALEND-MARKETO-REST" MODULE="talend-marketo-rest-1.0-20150911.jar" MVN="mvn:org.talend.libraries/talend-marketo-rest-1.0-20150911/6.1.0" REQUIRED_IF="(USE_REST_API == 'true')" />
|
||||
<IMPORT NAME="TALEND-MARKETO-REST" MODULE="talend-marketo-rest-2.0-20160622.jar" MVN="mvn:org.talend.libraries/talend-marketo-rest-2.0-20160622/6.2.1" REQUIRED_IF="(USE_REST_API == 'true')" />
|
||||
|
||||
</IMPORTS>
|
||||
</CODEGENERATION>
|
||||
|
||||
@@ -177,7 +177,7 @@
|
||||
<IMPORT NAME="XMLSCHEMA-CORE" MODULE="xmlschema-core-2.2.1.jar" MVN="mvn:org.talend.libraries/xmlschema-core-2.2.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/xmlschema-core-2.2.1.jar" REQUIRED_IF="(USE_REST_API == 'true')"/>
|
||||
<IMPORT NAME="WOODSTOX-CORE-ASL" MODULE="woodstox-core-asl-4.4.1.jar" MVN="mvn:org.talend.libraries/woodstox-core-asl-4.4.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/woodstox-core-asl-4.4.1.jar" REQUIRED_IF="(USE_REST_API == 'true')"/>
|
||||
<IMPORT NAME="GSON" MODULE="gson-2.3.1.jar" MVN="mvn:org.talend.libraries/gson-2.3.1/6.1.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/gson-2.3.1.jar" REQUIRED_IF="(USE_REST_API == 'true')"/>
|
||||
<IMPORT NAME="TALEND-MARKETO-REST" MODULE="talend-marketo-rest-1.0-20150911.jar" MVN="mvn:org.talend.libraries/talend-marketo-rest-1.0-20150911/6.1.0" REQUIRED_IF="(USE_REST_API == 'true')" />
|
||||
<IMPORT NAME="TALEND-MARKETO-REST" MODULE="talend-marketo-rest-2.0-20160622.jar" MVN="mvn:org.talend.libraries/talend-marketo-rest-2.0-20160622/6.2.1" REQUIRED_IF="(USE_REST_API == 'true')" />
|
||||
|
||||
</IMPORTS>
|
||||
</CODEGENERATION>
|
||||
|
||||
@@ -225,7 +225,7 @@
|
||||
<IMPORT NAME="XMLSCHEMA-CORE" MODULE="xmlschema-core-2.2.1.jar" MVN="mvn:org.talend.libraries/xmlschema-core-2.2.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/xmlschema-core-2.2.1.jar" REQUIRED_IF="(USE_REST_API == 'true')"/>
|
||||
<IMPORT NAME="WOODSTOX-CORE-ASL" MODULE="woodstox-core-asl-4.4.1.jar" MVN="mvn:org.talend.libraries/woodstox-core-asl-4.4.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/woodstox-core-asl-4.4.1.jar" REQUIRED_IF="(USE_REST_API == 'true')"/>
|
||||
<IMPORT NAME="GSON" MODULE="gson-2.3.1.jar" MVN="mvn:org.talend.libraries/gson-2.3.1/6.1.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/gson-2.3.1.jar" REQUIRED_IF="(USE_REST_API == 'true')"/>
|
||||
<IMPORT NAME="TALEND-MARKETO-REST" MODULE="talend-marketo-rest-1.0-20150911.jar" MVN="mvn:org.talend.libraries/talend-marketo-rest-1.0-20150911/6.1.0" REQUIRED_IF="(USE_REST_API == 'true')" />
|
||||
<IMPORT NAME="TALEND-MARKETO-REST" MODULE="talend-marketo-rest-2.0-20160622.jar" MVN="mvn:org.talend.libraries/talend-marketo-rest-2.0-20160622/6.2.1" REQUIRED_IF="(USE_REST_API == 'true')" />
|
||||
|
||||
</IMPORTS>
|
||||
</CODEGENERATION>
|
||||
|
||||
@@ -356,8 +356,8 @@
|
||||
REQUIRED_IF="(USE_REST_API == 'true')" />
|
||||
<IMPORT
|
||||
NAME="TALEND-MARKETO-REST"
|
||||
MODULE="talend-marketo-rest-1.0-20150911.jar"
|
||||
MVN="mvn:org.talend.libraries/talend-marketo-rest-1.0-20150911/6.1.0"
|
||||
MODULE="talend-marketo-rest-2.0-20160622.jar"
|
||||
MVN="mvn:org.talend.libraries/talend-marketo-rest-2.0-20160622/6.2.1"
|
||||
REQUIRED_IF="(USE_REST_API == 'true')" />
|
||||
|
||||
</IMPORTS>
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
|
||||
<CODEGENERATION>
|
||||
<IMPORTS>
|
||||
<IMPORT MODULE="janet-java-1.2.jar" MVN="mvn:org.talend.libraries/janet-java-1.2/6.0.0" NAME="janet-java-1.2"
|
||||
<IMPORT MODULE="janet-java-1.1.jar" MVN="mvn:org.talend.libraries/janet-java-1.1/6.0.0" NAME="janet-java-1.1"
|
||||
REQUIRED="true" />
|
||||
</IMPORTS>
|
||||
</CODEGENERATION>
|
||||
|
||||
@@ -178,7 +178,7 @@
|
||||
</ADVANCED_PARAMETERS>
|
||||
|
||||
<CODEGENERATION><IMPORTS>
|
||||
<IMPORT MODULE="janet-java-1.2.jar" MVN="mvn:org.talend.libraries/janet-java-1.2/6.0.0" NAME="janet-java-1.2"
|
||||
<IMPORT MODULE="janet-java-1.1.jar" MVN="mvn:org.talend.libraries/janet-java-1.1/6.0.0" NAME="janet-java-1.1"
|
||||
REQUIRED="true" />
|
||||
</IMPORTS></CODEGENERATION>
|
||||
|
||||
|
||||
@@ -170,7 +170,7 @@
|
||||
</ADVANCED_PARAMETERS>
|
||||
|
||||
<CODEGENERATION><IMPORTS>
|
||||
<IMPORT MODULE="janet-java-1.2.jar" MVN="mvn:org.talend.libraries/janet-java-1.2/6.0.0" NAME="janet-java-1.2"
|
||||
<IMPORT MODULE="janet-java-1.1.jar" MVN="mvn:org.talend.libraries/janet-java-1.1/6.0.0" NAME="janet-java-1.1"
|
||||
REQUIRED="true" />
|
||||
</IMPORTS></CODEGENERATION>
|
||||
|
||||
|
||||
@@ -280,11 +280,18 @@ if(columnList != null && columnList.size() > 0) {
|
||||
flagHasLob=true;
|
||||
columns += " CHAR(" + length + ") ENCLOSED BY '<startlob>' AND '<endlob>' ";
|
||||
} else if(advancedSeparator && JavaTypesManager.isNumberType(javaType)) {//add for issue
|
||||
String format = "";
|
||||
if(noThousandsSeparator){
|
||||
columns += (" \\\"TO_NUMBER(ltrim(rtrim(:" + column.getOriginalDbColumnName() + ")), '999999999999D999999999999', 'NLS_NUMERIC_CHARACTERS=''" + decimalSeparator + thousandsSeparator + "''')\\\"");
|
||||
}else{
|
||||
columns += (" \\\"TO_NUMBER(ltrim(rtrim(:" + column.getOriginalDbColumnName() + ")), '999G999G999G999D999999999999', 'NLS_NUMERIC_CHARACTERS=''" + decimalSeparator + thousandsSeparator + "''')\\\"");
|
||||
format = "999999999999D999999999999";
|
||||
} else if(column.getPrecision() != null) {
|
||||
format = "999G999G999G999D";
|
||||
for(int i = 0; i < column.getPrecision(); i++) {
|
||||
format = format + "9";
|
||||
}
|
||||
} else {
|
||||
format = "999G999G999G999D999999999999";
|
||||
}
|
||||
columns += (" \\\"TO_NUMBER(ltrim(rtrim(:" + column.getOriginalDbColumnName() + ")), " + format + ", 'NLS_NUMERIC_CHARACTERS=''" + decimalSeparator + thousandsSeparator + "''')\\\"");
|
||||
}
|
||||
}
|
||||
columns += ")";
|
||||
|
||||
@@ -213,7 +213,7 @@
|
||||
FIELD="FILE"
|
||||
NUM_ROW="80"
|
||||
REQUIRED="true"
|
||||
|
||||
SHOW_IF="USE_EXISTING_CLT_FILE == 'false'"
|
||||
>
|
||||
<DEFAULT>"__COMP_DEFAULT_FILE_DIR__/out.csv"</DEFAULT>
|
||||
</PARAMETER>
|
||||
@@ -223,7 +223,7 @@
|
||||
FIELD="CLOSED_LIST"
|
||||
NUM_ROW="80"
|
||||
REQUIRED="true"
|
||||
SHOW_IF="INPUT_INTO_TABLE_CLAUSE == 'false'"
|
||||
SHOW_IF="(USE_EXISTING_CLT_FILE == 'false') AND (INPUT_INTO_TABLE_CLAUSE == 'false')"
|
||||
>
|
||||
<ITEMS DEFAULT="INSERT">
|
||||
<ITEM NAME="INSERT" VALUE="INSERT" />
|
||||
|
||||
@@ -290,13 +290,13 @@ String inputConnName = null;
|
||||
%>
|
||||
java.util.List<String> paraListForLog_<%=cid %> = new java.util.ArrayList<String>();
|
||||
paraListForLog_<%=cid %>.addAll(paraList_<%=cid %>);
|
||||
List<String> parametersToEncrypt = new java.util.ArrayList<String>();
|
||||
List<String> parametersToEncrypt_<%=cid %> = new java.util.ArrayList<String>();
|
||||
<%
|
||||
List<IContextParameter> params = currentProcess.getContextManager().getDefaultContext().getContextParameterList();
|
||||
for (IContextParameter ctxParam :params){
|
||||
if("id_Password".equals(ctxParam.getType())) {
|
||||
%>
|
||||
parametersToEncrypt.add("<%=ctxParam.getName() %>");
|
||||
parametersToEncrypt_<%=cid %> .add("<%=ctxParam.getName() %>");
|
||||
<%
|
||||
}
|
||||
}
|
||||
@@ -328,7 +328,7 @@ String inputConnName = null;
|
||||
<%
|
||||
if(printParameter) {
|
||||
%>
|
||||
if(parametersToEncrypt.contains(key_<%=cid %>) && value_<%=cid %> != null) {
|
||||
if(parametersToEncrypt_<%=cid %> .contains(key_<%=cid %>) && value_<%=cid %> != null) {
|
||||
paraListForLog_<%=cid %>.add("--context_param " + key_<%=cid %> + "=" + routines.system.PasswordEncryptUtil.encryptPassword(String.valueOf(value_<%=cid %>)));
|
||||
} else {
|
||||
paraListForLog_<%=cid %>.add("--context_param " + key_<%=cid %> + "=" + value_<%=cid %>);
|
||||
@@ -356,7 +356,7 @@ String inputConnName = null;
|
||||
obj_<%=cid%> = <%=value %>;
|
||||
paraList_<%=cid %>.add("--context_param <%=name %>=" + RuntimeUtils.tRunJobConvertContext(obj_<%=cid%>));
|
||||
<% if(printParameter){ %>
|
||||
if(parametersToEncrypt.contains("<%=name %>") && obj_<%=cid%> != null) {
|
||||
if(parametersToEncrypt_<%=cid %> .contains("<%=name %>") && obj_<%=cid%> != null) {
|
||||
paraListForLog_<%=cid %>.add("--context_param <%=name %>=" + routines.system.PasswordEncryptUtil.encryptPassword(String.valueOf(RuntimeUtils.tRunJobConvertContext(obj_<%=cid%>))));
|
||||
} else {
|
||||
paraListForLog_<%=cid %>.add("--context_param <%=name %>=" + RuntimeUtils.tRunJobConvertContext(obj_<%=cid%>));
|
||||
|
||||
@@ -347,8 +347,8 @@
|
||||
/>
|
||||
<IMPORT
|
||||
NAME="partner"
|
||||
MODULE="partnerBulk-34.jar"
|
||||
MVN="mvn:org.talend.libraries/partnerBulk-34/6.1.0"
|
||||
MODULE="partner-34.0.0.jar"
|
||||
MVN="mvn:org.talend.components.salesforce/partner/34.0.0"
|
||||
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'"
|
||||
/>
|
||||
<IMPORT
|
||||
|
||||
@@ -191,7 +191,7 @@
|
||||
</PARAMETER>
|
||||
|
||||
<PARAMETER NAME="COMMIT_EVERY" FIELD="TEXT" NUM_ROW="7"
|
||||
REQUIRED="true" SHOW_IF="USE_EXISTING_CONNECTION == 'false' and ((DB_VERSION != 'VERTICA_7_0_X' and DB_VERSION != 'VERTICA_6_1_X' and DB_VERSION != 'VERTICA_6_0' and DB_VERSION != 'VERTICA_5_1') or DATA_ACTION != 'COPY')">
|
||||
REQUIRED="true" SHOW_IF="USE_EXISTING_CONNECTION == 'false' and ((DB_VERSION != 'VERTICA_7_1_X' and DB_VERSION != 'VERTICA_7_0_X' and DB_VERSION != 'VERTICA_6_1_X' and DB_VERSION != 'VERTICA_6_0' and DB_VERSION != 'VERTICA_5_1') or DATA_ACTION != 'COPY')">
|
||||
<DEFAULT>100</DEFAULT>
|
||||
</PARAMETER>
|
||||
|
||||
|
||||
@@ -72,13 +72,47 @@ class XMLTool{
|
||||
<%
|
||||
}
|
||||
|
||||
StringBuilder valueToUse = new StringBuilder();
|
||||
valueToUse.append(connName).append(".").append(column.getLabel());
|
||||
getFormattedValue(valueToUse.toString(), javaType, column);
|
||||
if(advancedSeparator && JavaTypesManager.isNumberType(javaType, column.isNullable())) {
|
||||
if(javaType == JavaTypesManager.BIGDECIMAL) {
|
||||
%>
|
||||
FormatterUtils.format_Number(<%=connName%>.<%=column.getLabel()%>.toPlainString(), <%= thousandsSeparator%>,<%=decimalSeparator %>)
|
||||
<%
|
||||
} else {
|
||||
%>
|
||||
FormatterUtils.format_Number(String.valueOf(<%=connName%>.<%=column.getLabel()%>), <%= thousandsSeparator %>,<%=decimalSeparator %>)
|
||||
<%
|
||||
}
|
||||
} else if(JavaTypesManager.isJavaPrimitiveType( column.getTalendType(), column.isNullable())){
|
||||
%>
|
||||
String.valueOf(<%=connName%>.<%=column.getLabel()%>)
|
||||
<%
|
||||
}else if(javaType == JavaTypesManager.DATE){
|
||||
if( column.getPattern() != null && column.getPattern().trim().length() != 0 ){
|
||||
%>
|
||||
FormatterUtils.format_Date(<%=connName%>.<%=column.getLabel()%>,<%=column.getPattern()%>)
|
||||
<%
|
||||
}else{
|
||||
%>
|
||||
<%=connName%>.<%=column.getLabel()%>
|
||||
<%
|
||||
}
|
||||
}else if (javaType == JavaTypesManager.BIGDECIMAL) {
|
||||
%>
|
||||
<%=connName%>.<%=column.getLabel()%>.toPlainString()
|
||||
<%
|
||||
}else if (javaType == JavaTypesManager.BYTE_ARRAY) {
|
||||
%>
|
||||
new String(<%=connName%>.<%=column.getLabel()%>)
|
||||
<%
|
||||
}else{
|
||||
%>
|
||||
<%=connName%>.<%=column.getLabel()%>.toString()
|
||||
<%
|
||||
}
|
||||
if(column.isNullable()){
|
||||
%>:<%
|
||||
if(!isNotSetDefault){
|
||||
getFormattedValue(column.getDefault(), javaType, column);
|
||||
%><%=column.getDefault()%><%
|
||||
}else{
|
||||
%>null<%
|
||||
}
|
||||
@@ -87,42 +121,6 @@ class XMLTool{
|
||||
)
|
||||
<%
|
||||
}
|
||||
|
||||
private void getFormattedValue(String valueToUse, JavaType javaType, IMetadataColumn column) {
|
||||
boolean hasPatternSet = column.getPattern() != null && !column.getPattern().trim().isEmpty();
|
||||
String pattern = hasPatternSet ? column.getPattern() : null;
|
||||
if(advancedSeparator && JavaTypesManager.isNumberType(javaType, column.isNullable())) {
|
||||
if(javaType == JavaTypesManager.BIGDECIMAL) {
|
||||
%>
|
||||
FormatterUtils.format_Number(<%=valueToUse%>.toPlainString(), <%= thousandsSeparator%>,<%=decimalSeparator %>)
|
||||
<%
|
||||
} else {
|
||||
%>
|
||||
FormatterUtils.format_Number(String.valueOf(<%=valueToUse%>), <%= thousandsSeparator %>,<%=decimalSeparator %>)
|
||||
<%
|
||||
}
|
||||
} else if(JavaTypesManager.isJavaPrimitiveType( column.getTalendType(), column.isNullable())){
|
||||
%>
|
||||
String.valueOf(<%=valueToUse%>)
|
||||
<%
|
||||
}else if(javaType == JavaTypesManager.DATE){
|
||||
%>
|
||||
FormatterUtils.format_Date(<%=valueToUse%>,<%=pattern%>)
|
||||
<%
|
||||
}else if (javaType == JavaTypesManager.BIGDECIMAL) {
|
||||
%>
|
||||
<%=valueToUse%>.toPlainString()
|
||||
<%
|
||||
}else if (javaType == JavaTypesManager.BYTE_ARRAY) {
|
||||
%>
|
||||
FormatterUtils.format(<%=valueToUse%>, <%=pattern%>)
|
||||
<%
|
||||
}else{
|
||||
%>
|
||||
String.valueOf(<%=valueToUse%>)
|
||||
<%
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ------------------- *** Dom4j generation mode start *** ------------------- //
|
||||
|
||||
@@ -838,13 +838,14 @@
|
||||
<libraryNeeded
|
||||
context="plugin:org.talend.libraries.hadoop.hdp.2.3"
|
||||
id="talend-spark-assembly-HDP_2_3"
|
||||
name="talend-spark-assembly-1.4.1.2.3.2.0-2950-hadoop2.7.1.2.3.2.0-2950-without-parquet.jar" mvn_uri="mvn:org.talend.libraries/talend-spark-assembly-1.4.1.2.3.2.0-2950-hadoop2.7.1.2.3.2.0-2950-without-parquet/6.1.0">
|
||||
name="talend-spark-assembly-1.4.1.2.3.2.0.jar"
|
||||
mvn_uri="mvn:org.talend.libraries/talend-spark-assembly-1.4.1.2.3.2.0/6.1.0">
|
||||
</libraryNeeded>
|
||||
|
||||
<libraryNeeded
|
||||
context="plugin:org.talend.libraries.hadoop.hdp.2.3"
|
||||
id="spark-streaming-kafka-assembly-HDP_2_3"
|
||||
name="spark-streaming-kafka-assembly_2.10-1.4.1.2.3.2.0-2950.jar"
|
||||
name="spark-streaming-kafka-assembly_2.10-1.4.1.2.3.2.0-2950.jar"
|
||||
mvn_uri="mvn:org.talend.libraries/spark-streaming-kafka-assembly_2.10-1.4.1.2.3.2.0-2950/6.1.0">
|
||||
</libraryNeeded>
|
||||
|
||||
@@ -1800,7 +1801,7 @@
|
||||
name="commons-codec-1.4.jar" mvn_uri="mvn:org.talend.libraries/commons-codec-1.4/6.0.0"
|
||||
uripath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.4.jar">
|
||||
</libraryNeeded>
|
||||
|
||||
|
||||
<libraryNeeded
|
||||
context="plugin:org.talend.libraries.apache.common"
|
||||
id="commons-codec-1.5.jar"
|
||||
@@ -2946,7 +2947,7 @@
|
||||
</libraryNeeded>
|
||||
<libraryNeeded
|
||||
id="commons-lang3-3.0.jar"
|
||||
name="commons-lang3-3.0.jar" mvn_uri="mvn:org.talend.libraries/commons-lang3-3.0/6.0.0"
|
||||
name="commons-lang3-3.0.jar" mvn_uri="mvn:org.talend.libraries/commons-lang3-3.0/6.0.0"
|
||||
context="plugin:org.talend.libraries.apache.common"
|
||||
uripath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang3-3.0.jar">
|
||||
</libraryNeeded>
|
||||
@@ -4242,7 +4243,12 @@
|
||||
<library id="netty-all-4.0.23.Final.jar"/>
|
||||
<library id="protobuf-java-2.5.0.jar"/>
|
||||
<library id="slf4j-api-1.7.10.jar"/>
|
||||
<library id="slf4j-log4j12-1.7.10.jar"/>
|
||||
<library id="zookeeper-HDP_2_3"/>
|
||||
<library id="hadoop-hdfs-HDP_2_3"/>
|
||||
<library id="servlet-api-2.5.jar"/>
|
||||
<library id="commons-io-2.4.jar"/>
|
||||
<library id="commons-cli-1.2.jar"/>
|
||||
</libraryNeededGroup>
|
||||
|
||||
<!-- HBase libraries for HDP 2.2 -->
|
||||
@@ -7151,7 +7157,7 @@
|
||||
id="derby-10.4.2.0.jar">
|
||||
</library>
|
||||
</libraryNeededGroup>
|
||||
|
||||
|
||||
<libraryNeededGroup
|
||||
description="The lastest Hive libraries of MAPR41X"
|
||||
id="HIVE100-LIB-MAPR41X_LASTEST"
|
||||
@@ -7466,7 +7472,7 @@
|
||||
id="high-scale-lib-1.1.1.jar">
|
||||
</library>
|
||||
</libraryNeededGroup>
|
||||
|
||||
|
||||
<libraryNeededGroup
|
||||
description="The lastest Hive hbase storage libraries of MAPR41X"
|
||||
id="HIVE100-HBASE-LIB-MAPR41X_LASTEST"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.localprovider</artifactId>
|
||||
@@ -74,7 +74,7 @@
|
||||
<artifactItem>
|
||||
<groupId>org.talend.libraries</groupId>
|
||||
<artifactId>talend-marketo-rest</artifactId>
|
||||
<version>1.0-20150911</version>
|
||||
<version>2.0-20160622</version>
|
||||
<type>jar</type>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${marketo.dir}</outputDirectory>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.2.1-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.core.generic</artifactId>
|
||||
|
||||
@@ -42,16 +42,6 @@ public class ComponentContextPropertyValueEvaluator implements PropertyValueEval
|
||||
if (storedValue == null) {
|
||||
return storedValue;
|
||||
}
|
||||
List<?> possibleValues = property.getPossibleValues();
|
||||
if (possibleValues != null) {
|
||||
if (storedValue instanceof String && !ContextParameterUtils.isContainContextParam((String) storedValue)) {
|
||||
for (Object possibleValue : possibleValues) {
|
||||
if (possibleValue.toString().equals(storedValue)) {
|
||||
return possibleValue;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (storedValue instanceof Schema || storedValue instanceof List || storedValue instanceof Enum
|
||||
|| storedValue instanceof Boolean) {
|
||||
return storedValue;
|
||||
@@ -87,13 +77,21 @@ public class ComponentContextPropertyValueEvaluator implements PropertyValueEval
|
||||
}
|
||||
}
|
||||
if (GenericTypeUtils.isEnumType(property)) {
|
||||
List<?> propertyPossibleValues = ((Property<?>) property).getPossibleValues();
|
||||
if (propertyPossibleValues != null) {
|
||||
for (Object possibleValue : propertyPossibleValues) {
|
||||
if (possibleValue.toString().equals(rawValue)) {
|
||||
List<?> possibleValues = property.getPossibleValues();
|
||||
if (possibleValues != null) {
|
||||
Object firstValue = null;
|
||||
if (!possibleValues.isEmpty()) {
|
||||
firstValue = possibleValues.get(0);
|
||||
}
|
||||
String stringStoredValue = TalendQuoteUtils.removeQuotes(String.valueOf(rawValue));
|
||||
for (Object possibleValue : possibleValues) {
|
||||
if (possibleValue.toString().equals(stringStoredValue)) {
|
||||
return possibleValue;
|
||||
}
|
||||
}
|
||||
if (firstValue != null) {
|
||||
return firstValue;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (GenericTypeUtils.isStringType(property)) {
|
||||
|
||||
@@ -41,6 +41,7 @@ import org.talend.core.utils.TalendQuoteUtils;
|
||||
import org.talend.designer.core.generic.model.GenericElementParameter;
|
||||
import org.talend.designer.core.generic.utils.ComponentsUtils;
|
||||
import org.talend.designer.core.i18n.Messages;
|
||||
import org.talend.designer.core.ui.editor.cmd.PropertyChangeCommand;
|
||||
import org.talend.designer.core.ui.editor.nodes.Node;
|
||||
import org.talend.designer.core.ui.editor.properties.controllers.AbstractElementPropertySectionController;
|
||||
import org.talend.designer.core.ui.editor.properties.controllers.creator.SelectAllTextControlCreator;
|
||||
@@ -77,7 +78,8 @@ public class NameAndLabelsReferenceController extends AbstractElementPropertySec
|
||||
String result = StringUtils.trimToEmpty(nameAndLabelsDialog.getResult());
|
||||
Text moduleText = (Text) hashCurControls.get(propertyName);
|
||||
moduleText.setText(result);
|
||||
gParam.setValue(result);
|
||||
PropertyChangeCommand pcc = new PropertyChangeCommand(elem, propertyName, result);
|
||||
return pcc;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -114,6 +116,7 @@ public class NameAndLabelsReferenceController extends AbstractElementPropertySec
|
||||
btnEdit.setData(NAME, MODULE);
|
||||
btnEdit.setData(PARAM_OBJ, param);
|
||||
btnEdit.setData(PARAMETER_NAME, param.getName());
|
||||
btnEdit.setEnabled(!param.isRepositoryValueUsed());
|
||||
// btnEdit.setEnabled(!param.isReadOnly());
|
||||
btnEdit.addSelectionListener(new SelectionAdapter() {
|
||||
|
||||
|
||||
@@ -330,8 +330,10 @@ public class SchemaReferenceController extends AbstractSchemaController {
|
||||
inputMetadata, inputMetaCopy, originaleOutputTable, outputMetaCopy);
|
||||
return changeMetadataCommand;
|
||||
} else {
|
||||
originaleOutputTable.setListColumns(outputMetaCopy.getListColumns());
|
||||
return null;
|
||||
ChangeMetadataCommand changeMetadataCommand = new ChangeMetadataCommand(node, param, inputNode,
|
||||
inputMetadata, inputMetaCopy, originaleOutputTable, outputMetaCopy);
|
||||
changeMetadataCommand.setPropagate(Boolean.FALSE);
|
||||
return changeMetadataCommand;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -180,7 +180,7 @@ public class Component extends AbstractBasicComponent {
|
||||
}
|
||||
NodeReturn nodeRet = new NodeReturn();
|
||||
nodeRet.setType(JavaTypesManager.STRING.getLabel());
|
||||
nodeRet.setDisplayName(ComponentReturnVariableUtils.getTranslationForVariable(ERROR_MESSAGE,
|
||||
nodeRet.setDisplayName(ComponentReturnVariableUtils.getTranslationForVariable(ComponentDefinition.RETURN_ERROR_MESSAGE,
|
||||
ComponentDefinition.RETURN_ERROR_MESSAGE));
|
||||
nodeRet.setName(ComponentReturnVariableUtils.getStudioNameFromVariable(ComponentDefinition.RETURN_ERROR_MESSAGE));
|
||||
nodeRet.setAvailability("AFTER"); //$NON-NLS-1$
|
||||
@@ -189,7 +189,8 @@ public class Component extends AbstractBasicComponent {
|
||||
for (Property<?> child : componentDefinition.getReturnProperties()) {
|
||||
nodeRet = new NodeReturn();
|
||||
nodeRet.setType(ComponentsUtils.getTalendTypeFromProperty(child).getId());
|
||||
nodeRet.setDisplayName(ComponentReturnVariableUtils.getTranslationForVariable(child.getName(), child.getDisplayName()));
|
||||
nodeRet.setDisplayName(
|
||||
ComponentReturnVariableUtils.getTranslationForVariable(child.getName(), child.getDisplayName()));
|
||||
nodeRet.setName(ComponentReturnVariableUtils.getStudioNameFromVariable(child.getName()));
|
||||
if (nodeRet.getName().equals(ERROR_MESSAGE)) {
|
||||
continue;
|
||||
|
||||
@@ -38,6 +38,7 @@ import org.talend.core.model.process.EConnectionType;
|
||||
import org.talend.core.model.process.EParameterFieldType;
|
||||
import org.talend.core.model.process.IConnection;
|
||||
import org.talend.core.model.process.IElement;
|
||||
import org.talend.core.model.process.INode;
|
||||
import org.talend.core.model.process.INodeConnector;
|
||||
import org.talend.core.model.process.IProcess;
|
||||
import org.talend.daikon.NamedThing;
|
||||
@@ -150,7 +151,7 @@ public class GenericElementParameter extends ElementParameter {
|
||||
}
|
||||
} else if (widgetProperty instanceof Property) {
|
||||
Property se = (Property<?>) widgetProperty;
|
||||
Object oldValue = se.getValue();
|
||||
Object oldValue = se.getStoredValue();
|
||||
Object value = newValue;
|
||||
List<?> propertyPossibleValues = ((Property<?>) widgetProperty).getPossibleValues();
|
||||
if (propertyPossibleValues != null) {
|
||||
@@ -186,7 +187,7 @@ public class GenericElementParameter extends ElementParameter {
|
||||
}
|
||||
|
||||
private void fireValidateStatusEvent() {
|
||||
if (hasPropertyChangeListener()) {
|
||||
if (hasPropertyChangeListener() && this.getFieldType() != EParameterFieldType.TEXT) {
|
||||
this.pcs.firePropertyChange(IElementParameterEventProperties.EVENT_VALIDATE_RESULT_UPDATE, null, getSubProperties()
|
||||
.getValidationResult());
|
||||
}
|
||||
@@ -332,7 +333,7 @@ public class GenericElementParameter extends ElementParameter {
|
||||
}
|
||||
}
|
||||
|
||||
private String getParameterName() {
|
||||
public String getParameterName() {
|
||||
String paramName = getName();
|
||||
if (paramName.indexOf(IGenericConstants.EXP_SEPARATOR) != -1) {
|
||||
paramName = paramName.substring(paramName.lastIndexOf(IGenericConstants.EXP_SEPARATOR) + 1);
|
||||
@@ -427,17 +428,16 @@ public class GenericElementParameter extends ElementParameter {
|
||||
}
|
||||
|
||||
private Properties getSubProperties() {
|
||||
return ComponentsUtils.getCurrentProperties(rootProperties, getName());
|
||||
return ComponentsUtils.getCurrentProperties(getRootProperties(), getName());
|
||||
}
|
||||
|
||||
public ComponentProperties getRootProperties() {
|
||||
if (this.getElement() instanceof INode) {
|
||||
return ((INode)this.getElement()).getComponentProperties();
|
||||
}
|
||||
return this.rootProperties;
|
||||
}
|
||||
|
||||
public void setRootProperties(ComponentProperties rootProperties) {
|
||||
this.rootProperties = rootProperties;
|
||||
}
|
||||
|
||||
public boolean isSupportContext() {
|
||||
return this.supportContext;
|
||||
}
|
||||
|
||||
@@ -272,7 +272,8 @@ public class ComponentsUtils {
|
||||
Property property = (Property) widgetProperty;
|
||||
param.setRequired(property.isRequired());
|
||||
param.setValue(getParameterValue(element, property, fieldType, isInitializing));
|
||||
if (EParameterFieldType.NAME_SELECTION_AREA.equals(fieldType)) {
|
||||
boolean isNameProperty = IGenericConstants.NAME_PROPERTY.equals(param.getParameterName());
|
||||
if (EParameterFieldType.NAME_SELECTION_AREA.equals(fieldType) || isNameProperty) {
|
||||
// Disable context support for this filed type.
|
||||
param.setSupportContext(false);
|
||||
} else {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user