Compare commits
28 Commits
patch/TPS-
...
patch/6.5.
| Author | SHA1 | Date | |
|---|---|---|---|
|
446313a0c0 | ||
|
|
6c8eaffca3 | ||
|
|
43fc6741a7 | ||
|
|
85db81c571 | ||
|
|
1df7bea3d4 | ||
|
|
a3d29cdc5b | ||
|
|
289f695a19 | ||
|
|
ecfbadd401 | ||
|
|
6b8ebff0de | ||
|
|
e5b6a01204 | ||
|
|
a671f45524 | ||
|
|
36396c628a | ||
|
|
b135ba8df6 | ||
|
|
f47c6f7339 | ||
|
|
395bf73b4a | ||
|
|
900250de11 | ||
|
|
8e5a5a66ff | ||
|
|
921e6439ca | ||
|
|
6a7a287366 | ||
|
|
11dcdad930 | ||
|
|
91899e86a3 | ||
|
|
4c18fcb26d | ||
|
|
4825c621a1 | ||
|
|
9473431807 | ||
|
|
0b126d642f | ||
|
|
28920c8726 | ||
|
|
a84c3f79a8 | ||
|
|
bce16b42c0 |
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.business.diagram</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.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.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.exchange</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.libs</artifactId>
|
||||
|
||||
@@ -159,7 +159,7 @@
|
||||
<IMPORTS>
|
||||
<IMPORT NAME="google-api-client-1.19.0.jar" MODULE="google-api-client-1.19.0.jar" MVN="mvn:org.talend.libraries/google-api-client-1.19.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-api-client-1.19.0.jar" REQUIRED="true" />
|
||||
<IMPORT NAME="google-api-services-oauth2-v2-rev78-1.19.0.jar" MODULE="google-api-services-oauth2-v2-rev78-1.19.0.jar" MVN="mvn:org.talend.libraries/google-api-services-oauth2-v2-rev78-1.19.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-api-services-oauth2-v2-rev78-1.19.0.jar" REQUIRED="true" />
|
||||
<IMPORT NAME="google-api-services-bigquery-v2-rev168-1.19.0.jar" MODULE="google-api-services-bigquery-v2-rev168-1.19.0.jar" MVN="mvn:org.talend.libraries/google-api-services-bigquery-v2-rev168-1.19.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-api-services-bigquery-v2-rev168-1.19.0.jar" REQUIRED="true" />
|
||||
<IMPORT NAME="google-api-services-bigquery-v2-rev391-1.21.0.jar" MODULE="google-api-services-bigquery-v2-rev391-1.21.0.jar" MVN="mvn:org.talend.libraries/google-api-services-bigquery-v2-rev391-1.21.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-api-services-bigquery-v2-rev391-1.21.0.jar" REQUIRED="true" />
|
||||
<IMPORT NAME="google-http-client-1.19.0.jar" MODULE="google-http-client-1.19.0.jar" MVN="mvn:org.talend.libraries/google-http-client-1.19.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-http-client-1.19.0.jar" REQUIRED="true" />
|
||||
<IMPORT NAME="google-oauth-client-1.19.0.jar" MODULE="google-oauth-client-1.19.0.jar" MVN="mvn:org.talend.libraries/google-oauth-client-1.19.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-oauth-client-1.19.0.jar" REQUIRED="true" />
|
||||
<IMPORT NAME="google-http-client-jackson2-1.19.0.jar" MODULE="google-http-client-jackson2-1.19.0.jar" MVN="mvn:org.talend.libraries/google-http-client-jackson2-1.19.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-http-client-jackson2-1.19.0.jar" REQUIRED="true" />
|
||||
|
||||
@@ -29,8 +29,25 @@ class BigQueryUtil_<%=cid%> {
|
||||
}
|
||||
}
|
||||
|
||||
private String getLocation(com.google.api.services.bigquery.model.JobConfigurationQuery queryConfig) throws Exception {
|
||||
String location = null;
|
||||
com.google.api.services.bigquery.model.JobConfiguration config = new com.google.api.services.bigquery.model.JobConfiguration();
|
||||
config.setQuery(queryConfig);
|
||||
config.setDryRun(true);
|
||||
com.google.api.services.bigquery.model.Job job = new com.google.api.services.bigquery.model.Job();
|
||||
job.setConfiguration(config);
|
||||
List<com.google.api.services.bigquery.model.TableReference> referencedTables = bigqueryclient.jobs().insert(projectId, job).execute().getStatistics().getQuery().getReferencedTables();
|
||||
if(referencedTables != null && !referencedTables.isEmpty()) {
|
||||
location = bigqueryclient.tables().get(projectId, referencedTables.get(0).getDatasetId(), referencedTables.get(0).getTableId()).execute().getLocation();
|
||||
}
|
||||
return location;
|
||||
}
|
||||
|
||||
private void createDataset(String location) throws Exception {
|
||||
com.google.api.services.bigquery.model.Dataset dataset = new com.google.api.services.bigquery.model.Dataset().setDatasetReference(new com.google.api.services.bigquery.model.DatasetReference().setProjectId(projectId).setDatasetId(tempDataset));
|
||||
if(location != null) {
|
||||
dataset.setLocation(location);
|
||||
}
|
||||
String description = "Dataset for BigQuery query job temporary table";
|
||||
dataset.setFriendlyName(description);
|
||||
dataset.setDescription(description);
|
||||
@@ -44,7 +61,7 @@ class BigQueryUtil_<%=cid%> {
|
||||
this.useLargeResult = true;
|
||||
tempDataset = genTempName("dataset");
|
||||
tempTable = genTempName("table");
|
||||
createDataset(null);
|
||||
createDataset(getLocation(queryConfig));
|
||||
queryConfig.setAllowLargeResults(true);
|
||||
queryConfig.setDestinationTable(new com.google.api.services.bigquery.model.TableReference()
|
||||
.setProjectId(projectId)
|
||||
|
||||
@@ -127,7 +127,7 @@
|
||||
<IMPORTS>
|
||||
<IMPORT NAME="google-api-client-1.19.0.jar" MODULE="google-api-client-1.19.0.jar" MVN="mvn:org.talend.libraries/google-api-client-1.19.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-api-client-1.19.0.jar" REQUIRED="true" />
|
||||
<IMPORT NAME="google-api-services-oauth2-v2-rev78-1.19.0.jar" MODULE="google-api-services-oauth2-v2-rev78-1.19.0.jar" MVN="mvn:org.talend.libraries/google-api-services-oauth2-v2-rev78-1.19.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-api-services-oauth2-v2-rev78-1.19.0.jar" REQUIRED="true" />
|
||||
<IMPORT NAME="google-api-services-bigquery-v2-rev168-1.19.0.jar" MODULE="google-api-services-bigquery-v2-rev168-1.19.0.jar" MVN="mvn:org.talend.libraries/google-api-services-bigquery-v2-rev168-1.19.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-api-services-bigquery-v2-rev168-1.19.0.jar" REQUIRED="true" />
|
||||
<IMPORT NAME="google-api-services-bigquery-v2-rev391-1.21.0.jar" MODULE="google-api-services-bigquery-v2-rev391-1.21.0.jar" MVN="mvn:org.talend.libraries/google-api-services-bigquery-v2-rev391-1.21.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-api-services-bigquery-v2-rev391-1.21.0.jar" REQUIRED="true" />
|
||||
<IMPORT NAME="google-http-client-1.19.0.jar" MODULE="google-http-client-1.19.0.jar" MVN="mvn:org.talend.libraries/google-http-client-1.19.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-http-client-1.19.0.jar" REQUIRED="true" />
|
||||
<IMPORT NAME="google-oauth-client-1.19.0.jar" MODULE="google-oauth-client-1.19.0.jar" MVN="mvn:org.talend.libraries/google-oauth-client-1.19.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-oauth-client-1.19.0.jar" REQUIRED="true" />
|
||||
<IMPORT NAME="google-http-client-jackson2-1.19.0.jar" MODULE="google-http-client-jackson2-1.19.0.jar" MVN="mvn:org.talend.libraries/google-http-client-jackson2-1.19.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-http-client-jackson2-1.19.0.jar" REQUIRED="true" />
|
||||
|
||||
@@ -623,7 +623,7 @@ for (int iInputTable = 0; iInputTable < sizeInputTables - 1; iInputTable++) { //
|
||||
}
|
||||
}
|
||||
dis.readFully(<%= currentTableName %>Struct.commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>, 0, length);
|
||||
this.<%= connection.getName() %>__<%= column.getLabel() %> = new String(<%= currentTableName %>Struct.commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>, 0, length);
|
||||
this.<%= connection.getName() %>__<%= column.getLabel() %> = new String(<%= currentTableName %>Struct.commonByteArray_<%= codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>, 0, length, utf8Charset);
|
||||
}
|
||||
<%
|
||||
} else if(("java.util.Date").equals(typeToGenerate)) {
|
||||
@@ -706,7 +706,7 @@ for (int iInputTable = 0; iInputTable < sizeInputTables - 1; iInputTable++) { //
|
||||
}
|
||||
}
|
||||
dis.readFully(<%= currentTableName %>Struct.commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>, 0, length);
|
||||
this.exprKey_<%= nextInputTable.getName() %>__<%= column.getLabel() %> = new String(<%= currentTableName %>Struct.commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>, 0, length);
|
||||
this.exprKey_<%= nextInputTable.getName() %>__<%= column.getLabel() %> = new String(<%= currentTableName %>Struct.commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>, 0, length, utf8Charset);
|
||||
}
|
||||
<%
|
||||
} else if(("byte[]").equals(typeToGenerate)) {
|
||||
@@ -797,7 +797,7 @@ for (int iInputTable = 0; iInputTable < sizeInputTables - 1; iInputTable++) { //
|
||||
if(this.<%= connection.getName() %>__<%= column.getLabel() %> == null) {
|
||||
dos.writeInt(-1);
|
||||
} else {
|
||||
byte[] byteArray = this.<%= connection.getName() %>__<%= column.getLabel() %>.getBytes();
|
||||
byte[] byteArray = this.<%= connection.getName() %>__<%= column.getLabel() %>.getBytes(utf8Charset);
|
||||
dos.writeInt(byteArray.length);
|
||||
dos.write(byteArray);
|
||||
}
|
||||
@@ -858,7 +858,7 @@ for (int iInputTable = 0; iInputTable < sizeInputTables - 1; iInputTable++) { //
|
||||
if(this.exprKey_<%= nextInputTable.getName() %>__<%= column.getLabel() %> == null) {
|
||||
dos.writeInt(-1);
|
||||
} else {
|
||||
byte[] byteArray = this.exprKey_<%= nextInputTable.getName() %>__<%= column.getLabel() %>.getBytes();
|
||||
byte[] byteArray = this.exprKey_<%= nextInputTable.getName() %>__<%= column.getLabel() %>.getBytes(utf8Charset);
|
||||
dos.writeInt(byteArray.length);
|
||||
dos.write(byteArray);
|
||||
}
|
||||
|
||||
@@ -4,5 +4,11 @@ java.text.DateFormat dateStrFormat = new java.text.SimpleDateFormat("yyyyMMddHHm
|
||||
final String queryIdentifier = projectName + "_" + jobName + "_" + jobVersion.replace(".", "_") + "_<%=cid%>_" + dateStrFormat.format(new Date(startTime));
|
||||
// For MapReduce Mode
|
||||
stmt_<%=cid %>.execute("set mapred.job.name=" + queryIdentifier);
|
||||
// For Tez Mode
|
||||
stmt_<%=cid %>.execute("set hive.query.name=" + queryIdentifier);
|
||||
<%
|
||||
if(hiveDistrib.doSupportTezForHive()) {
|
||||
%>
|
||||
// For Tez Mode
|
||||
stmt_<%=cid %>.execute("set hive.query.name=" + queryIdentifier);
|
||||
<%
|
||||
}
|
||||
%>
|
||||
|
||||
@@ -2008,7 +2008,11 @@ public class CLASS {
|
||||
setStmt.append(");\r\n");
|
||||
}
|
||||
setStmt.append("} else {\r\n");
|
||||
setStmt.append(prefix + cid + ".setNull(" + index + dynamic + ", java.sql.Types.DATE);\r\n");
|
||||
if ("TIME".equals(dbType)) {
|
||||
setStmt.append(prefix + cid + ".setNull(" + index + dynamic + ", java.sql.Types.TIME);\r\n");
|
||||
} else {
|
||||
setStmt.append(prefix + cid + ".setNull(" + index + dynamic + ", java.sql.Types.DATE);\r\n");
|
||||
}
|
||||
setStmt.append("}\r\n");
|
||||
} else {
|
||||
setStmt.append(prefix + cid + ".set" + typeToGenerate + "(" + index + dynamic + ", " + incomingConnName + "." + column.getName() + ");\r\n");
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.localprovider</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.core.generic</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.core</artifactId>
|
||||
|
||||
@@ -945,7 +945,7 @@ public class JobSettingsManager {
|
||||
.getValue();
|
||||
String fileSparator = (String) process.getElementParameter(EParameterName.FIELDSEPARATOR.getName()).getValue();
|
||||
tContextLoadNode.getElementParameter(EParameterName.IMPLICIT_TCONTEXTLOAD_FILE.getName()).setValue(inputFile);
|
||||
String regex = FileSeparator.getSeparatorsRegexp(TalendQuoteUtils.removeQuotes(fileSparator));
|
||||
String regex = FileSeparator.getSeparatorsRegexp(fileSparator);
|
||||
tContextLoadNode.getElementParameter(JobSettingsConstants.IMPLICIT_TCONTEXTLOAD_REGEX).setValue(regex);
|
||||
} else {
|
||||
// is db
|
||||
@@ -1204,33 +1204,39 @@ public class JobSettingsManager {
|
||||
realDbTypeForJDBC = ExtractMetaDataUtils.getInstance().getDbTypeByClassName(driverClassValue);
|
||||
}
|
||||
return realDbTypeForJDBC;
|
||||
}
|
||||
|
||||
private static List<String> getMetadataChars() {
|
||||
String[] metaChars = new String[] { "\\", "^", "$", ".", "?", "|", "[", "+", "*", "{", "(", ")", "}", "]" };
|
||||
return Arrays.asList(metaChars);
|
||||
}
|
||||
}
|
||||
|
||||
public static class FileSeparator {
|
||||
|
||||
private static List<String> METADATA_CHAR = getMetadataChars();
|
||||
|
||||
static String doRegexpQuote(String separators) {
|
||||
if (StringUtils.isEmpty(separators)) {
|
||||
return separators;
|
||||
} else if (separators.length() == 1) {
|
||||
if (separators.equals("\\")) { // special \ //$NON-NLS-1$
|
||||
return "\\\\\\" + separators;//$NON-NLS-1$
|
||||
} else if (getMetadataChars().contains(separators)) {
|
||||
return "\\\\" + separators;//$NON-NLS-1$
|
||||
return TalendQuoteUtils.addQuotes("");
|
||||
}
|
||||
String filedSeparator = TalendQuoteUtils.removeQuotes(separators);
|
||||
if (filedSeparator.length() == 1) {
|
||||
if (filedSeparator.equals("\\")) { // special \ //$NON-NLS-1$
|
||||
return TalendQuoteUtils.addQuotes("\\\\\\" + filedSeparator);//$NON-NLS-1$
|
||||
} else if (METADATA_CHAR.contains(filedSeparator)) {
|
||||
return TalendQuoteUtils.addQuotes("\\\\" + filedSeparator);//$NON-NLS-1$
|
||||
}
|
||||
} else {
|
||||
return doRegexpQuote(separators.substring(0, 1)) + doRegexpQuote(separators.substring(1));
|
||||
} else if (filedSeparator.equals("||")) {// TUP-17232
|
||||
return TalendQuoteUtils.addQuotes("\\\\" + "|" + "\\\\" + "|");//$NON-NLS-1$
|
||||
}
|
||||
return separators;
|
||||
}
|
||||
|
||||
static String getSeparatorsRegexp(String fileSeparator) {
|
||||
fileSeparator = TalendQuoteUtils.addQuotes(doRegexpQuote(fileSeparator));
|
||||
fileSeparator = doRegexpQuote(fileSeparator);
|
||||
return "\"^([^\"+" + fileSeparator + "+\"]*)\"+" + fileSeparator + "+\"(.*)$\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
}
|
||||
|
||||
private static List<String> getMetadataChars() {
|
||||
String[] metaChars = new String[] { "\\", "^", "$", ".", "?", "|", "[", "+", "*", "{", "(", ")", "}", "]", "\"" };
|
||||
return Arrays.asList(metaChars);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@ public class EditProcess extends AbstractProcessAction implements IIntroAction {
|
||||
&& node.getObjectType() == getProcessType()) {
|
||||
final IProxyRepositoryFactory repFactory =
|
||||
DesignerPlugin.getDefault().getRepositoryService().getProxyRepositoryFactory();
|
||||
this.setText(getLabel(repFactory.isPotentiallyEditable(node.getObject())));
|
||||
this.setText(getLabel(repFactory.isPotentiallyEditable(node.getObject())) + " : " + node.getLabel()); //$NON-NLS-1$
|
||||
} else {
|
||||
canWork = false;
|
||||
}
|
||||
|
||||
@@ -13,7 +13,9 @@
|
||||
package org.talend.designer.core.ui.editor.cmd;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -438,6 +440,8 @@ public class ChangeActivateStatusElementCommand extends Command {
|
||||
for (INode node : jobletandnodeList) {
|
||||
|
||||
if (node.isActivate()) {
|
||||
// MiddleNodes Map<IConnection, Node> connection->Node
|
||||
// if Node deactivate then connection->null
|
||||
Map<IConnection, Node> outMiddleNodes = getAllOutMiddleNodes(node);
|
||||
Map<IConnection, Node> inMiddleNodes = getAllInMiddleNodes(node);
|
||||
|
||||
@@ -484,7 +488,8 @@ public class ChangeActivateStatusElementCommand extends Command {
|
||||
}
|
||||
}
|
||||
if (!exist) {
|
||||
middConnMap.put(nodeList, connList);
|
||||
List<IConnection> exactConnections = getExactConnectionsBetweenNodes(node, nodeList, connList, true);
|
||||
middConnMap.put(nodeList, exactConnections);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -531,11 +536,86 @@ public class ChangeActivateStatusElementCommand extends Command {
|
||||
}
|
||||
}
|
||||
if (!exist) {
|
||||
middConnMap.put(nodeList, connList);
|
||||
List<IConnection> exactConnections = getExactConnectionsBetweenNodes(node, nodeList, connList, false);
|
||||
middConnMap.put(nodeList, exactConnections);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// middConnMap=> key(BaseNode, Node1, Node2......);
|
||||
// BaseNode->(0/some deactivate node)->Node1;BaseNode->(0/some deactivate node)->Node2;
|
||||
// middConnMap=> value(connections between Node1 and Node2).
|
||||
return middConnMap;
|
||||
}
|
||||
|
||||
public static List<IConnection> getExactConnectionsBetweenNodes(INode node, List<INode> nodeList, List<IConnection> connList,
|
||||
boolean isOutgoing) {
|
||||
List<IConnection> exactList = new ArrayList<IConnection>(connList);
|
||||
List<INode> targetNodeList = new ArrayList<INode>(nodeList);
|
||||
targetNodeList.remove(node);
|
||||
Map<INode, Set<INode>> pathhm = new HashMap<INode, Set<INode>>();
|
||||
for (INode targetNode : targetNodeList) {
|
||||
Set<INode> pathNodes = new HashSet<INode>();
|
||||
pathNodes.add(node);
|
||||
// Got the passby Node between node and tatgetNode
|
||||
boolean pathFound = getPathsNodes(node, targetNode, pathNodes, isOutgoing);
|
||||
if (pathFound) {
|
||||
pathhm.put(targetNode, pathNodes);
|
||||
}
|
||||
}
|
||||
|
||||
Collection<Set<INode>> pathSets = pathhm.values();
|
||||
if (!pathSets.isEmpty()) {
|
||||
Iterator<IConnection> connectionIte = exactList.iterator();
|
||||
while (connectionIte.hasNext()) {
|
||||
IConnection connection = (IConnection) connectionIte.next();
|
||||
|
||||
boolean rightIn = false;
|
||||
|
||||
Iterator<Set<INode>> pathIte = pathSets.iterator();
|
||||
while (pathIte.hasNext()) {
|
||||
Set<INode> nodes = (Set<INode>) pathIte.next();
|
||||
// if sourceNode and targetNode of the connection don't exist in the NodePath then this connection
|
||||
// doesn't belong to this flow of BaseNode->(0/some deactivate node)->Node1
|
||||
// maybe belongs to other flow of BaseNode but all flow deactivate.
|
||||
if (nodes.contains(connection.getSource()) && nodes.contains(connection.getTarget())) {
|
||||
rightIn = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!rightIn) {
|
||||
connectionIte.remove();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
return exactList;
|
||||
}
|
||||
|
||||
private static boolean getPathsNodes(INode node, INode targetNode, Set<INode> nodes, boolean isOutgoing) {
|
||||
List<? extends IConnection> connections = null;
|
||||
if (node.equals(targetNode)) {
|
||||
return true;
|
||||
}
|
||||
if (isOutgoing) {
|
||||
connections = node.getOutgoingConnections();
|
||||
} else {
|
||||
connections = node.getIncomingConnections();
|
||||
}
|
||||
for (IConnection connection : connections) {
|
||||
INode deepNode = null;
|
||||
if (isOutgoing) {
|
||||
deepNode = connection.getTarget();
|
||||
} else {
|
||||
deepNode = connection.getSource();
|
||||
}
|
||||
boolean flag = getPathsNodes(deepNode, targetNode, nodes, isOutgoing);
|
||||
if (flag) {
|
||||
nodes.add(deepNode);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2017 Talend Inc. - www.talend.com
|
||||
// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
|
||||
//
|
||||
// This source code is available under agreement available at
|
||||
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
|
||||
@@ -37,6 +37,7 @@ import org.talend.core.ui.IJobletProviderService;
|
||||
import org.talend.core.utils.KeywordsValidator;
|
||||
import org.talend.designer.core.ICamelDesignerCoreService;
|
||||
import org.talend.designer.core.i18n.Messages;
|
||||
import org.talend.designer.core.model.components.EParameterName;
|
||||
import org.talend.designer.core.model.process.ConnectionManager;
|
||||
import org.talend.designer.core.ui.dialog.mergeorder.ConnectionTableAndSchemaNameDialog;
|
||||
import org.talend.designer.core.ui.editor.connections.Connection;
|
||||
@@ -72,6 +73,8 @@ public class ConnectionCreateCommand extends Command {
|
||||
private static boolean creatingConnection = false;
|
||||
|
||||
private boolean insertTMap;
|
||||
|
||||
private Map<EParameterName, Object> connectionParameters;
|
||||
|
||||
/**
|
||||
* Initialisation of the creation of the connection with a source and style of connection.
|
||||
@@ -87,6 +90,9 @@ public class ConnectionCreateCommand extends Command {
|
||||
this.metaName = (String) listArgs.get(0);
|
||||
this.connectionName = (String) listArgs.get(1);
|
||||
newMetadata = (IMetadataTable) listArgs.get(2);
|
||||
if (listArgs.size() >= 4) {
|
||||
connectionParameters = (Map<EParameterName, Object>) listArgs.get(3);
|
||||
}
|
||||
}
|
||||
|
||||
public ConnectionCreateCommand(Node nodeSource, String connectorName, List<Object> listArgs, boolean insertTMap) {
|
||||
@@ -411,7 +417,7 @@ public class ConnectionCreateCommand extends Command {
|
||||
monitorConnection);
|
||||
} else {
|
||||
this.connection = new Connection(source, target, newLineStyle, connectorName, metaName, connectionName, metaName,
|
||||
monitorConnection);
|
||||
monitorConnection, this.connectionParameters);
|
||||
}
|
||||
} else { // in case of redo, reuse the same instance
|
||||
if (newMetadata != null) {
|
||||
|
||||
@@ -41,6 +41,8 @@ import org.talend.core.model.process.INode;
|
||||
import org.talend.core.model.process.IProcess;
|
||||
import org.talend.core.model.process.IProcess2;
|
||||
import org.talend.core.model.properties.ProcessItem;
|
||||
import org.talend.core.model.properties.Project;
|
||||
import org.talend.core.model.properties.Property;
|
||||
import org.talend.core.model.update.UpdatesConstants;
|
||||
import org.talend.core.ui.IJobletProviderService;
|
||||
import org.talend.core.ui.process.IGraphicalNode;
|
||||
@@ -60,6 +62,7 @@ import org.talend.designer.core.utils.DesignerUtilities;
|
||||
import org.talend.designer.core.utils.JobSettingVersionUtil;
|
||||
import org.talend.designer.core.utils.ValidationRulesUtil;
|
||||
import org.talend.designer.runprocess.ItemCacheManager;
|
||||
import org.talend.repository.ProjectManager;
|
||||
|
||||
/**
|
||||
* Command that changes a given property. It will call the set or get property value in an element. This element can be
|
||||
@@ -396,9 +399,15 @@ public class PropertyChangeCommand extends Command {
|
||||
}
|
||||
if (isJobletComponent) {
|
||||
// 2.if it is a jobletcomponent,reload the component by the version
|
||||
String id = service.getJobletComponentItem((Node) elem).getId();
|
||||
Property jobletProperty = service.getJobletComponentItem((Node) elem);
|
||||
Project project = ProjectManager.getInstance().getProject(jobletProperty);
|
||||
String projTechLabel = null;
|
||||
if (project != null) {
|
||||
projTechLabel = project.getTechnicalLabel();
|
||||
}
|
||||
String id = jobletProperty.getId();
|
||||
String version = (String) newValue;
|
||||
IComponent newComponent = service.setPropertyForJobletComponent(id, version);
|
||||
IComponent newComponent = service.setPropertyForJobletComponent(projTechLabel, id, version);
|
||||
reloadNode((Node) elem, newComponent);
|
||||
} else {
|
||||
|
||||
|
||||
@@ -108,6 +108,8 @@ public class Connection extends Element implements IConnection, IPerformance {
|
||||
private boolean monitorConnection = false;
|
||||
|
||||
public boolean setNullColumn = false;
|
||||
|
||||
private Map<EParameterName, Object> paramValues = new HashMap<EParameterName, Object>();
|
||||
|
||||
/**
|
||||
* Tells if this connection has a subjob source or not instead of a node.
|
||||
@@ -122,6 +124,13 @@ public class Connection extends Element implements IConnection, IPerformance {
|
||||
String linkName, final boolean monitorConnection) {
|
||||
init(source, target, lineStyle, connectorName, metaName, linkName, monitorConnection);
|
||||
}
|
||||
|
||||
public Connection(INode source, INode target, EConnectionType lineStyle, String connectorName, String metaName,
|
||||
String linkName, String uniqueName, final boolean monitorConnection, final Map<EParameterName, Object> paramValues) {
|
||||
this.uniqueName = uniqueName;
|
||||
this.paramValues = paramValues;
|
||||
init(source, target, lineStyle, connectorName, metaName, linkName, monitorConnection);
|
||||
}
|
||||
|
||||
// used only when loading a process && connection creation
|
||||
public Connection(INode source, INode target, EConnectionType lineStyle, String connectorName, String metaName,
|
||||
@@ -518,6 +527,21 @@ public class Connection extends Element implements IConnection, IPerformance {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
updateParametersValues();
|
||||
}
|
||||
|
||||
private void updateParametersValues() {
|
||||
|
||||
if (paramValues == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (Map.Entry<EParameterName, Object> param : paramValues.entrySet()) {
|
||||
if (param.getValue() != null) {
|
||||
setPropertyValue(param.getKey().getName(), param.getValue());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void createParallelizeParameters() {
|
||||
|
||||
@@ -2837,7 +2837,16 @@ public class Node extends Element implements IGraphicalNode {
|
||||
break;
|
||||
}
|
||||
if (!NodeQueryCheckUtil.checkQueryOK(this, currentQuery)) {
|
||||
Problems.add(ProblemStatus.WARNING, this, errMessage);
|
||||
boolean show = true;
|
||||
// match the query and check again
|
||||
if (NodeQueryCheckUtil.isNeedMatchQuery()) {
|
||||
String matchSql = NodeQueryCheckUtil.matchQueryComments(this, currentQuery);
|
||||
NodeQueryCheckUtil.checkQueryOK(this, matchSql);
|
||||
show = NodeQueryCheckUtil.isNeedMatchQuery();
|
||||
}
|
||||
if (show) {
|
||||
Problems.add(ProblemStatus.WARNING, this, errMessage);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -4772,7 +4781,13 @@ public class Node extends Element implements IGraphicalNode {
|
||||
if (targetParam != null) {
|
||||
if (sourceParam.getName().equals(EParameterName.LABEL.getName())
|
||||
&& (sourceParam.getValue() == null || "".equals(sourceParam.getValue()))) { //$NON-NLS-1$
|
||||
setPropertyValue(sourceParam.getName(), component.getProcess().getName());
|
||||
String name = null;
|
||||
if (EComponentType.JOBLET.equals(component.getComponentType())) {
|
||||
name = component.getName();
|
||||
} else {
|
||||
name = component.getProcess().getName();
|
||||
}
|
||||
setPropertyValue(sourceParam.getName(), name);
|
||||
} else {
|
||||
setPropertyValue(sourceParam.getName(), sourceParam.getValue());
|
||||
}
|
||||
|
||||
@@ -2217,8 +2217,16 @@ public class Process extends Element implements IProcess2, IGEFProcess, ILastVer
|
||||
IJobletProviderService service = (IJobletProviderService) GlobalServiceRegister.getDefault()
|
||||
.getService(IJobletProviderService.class);
|
||||
if (service != null) {
|
||||
String componentProcessId = service.getJobletComponentItem(component).getId();
|
||||
component = service.setPropertyForJobletComponent(componentProcessId, jobletVersion);
|
||||
Property jobletProperty = service.getJobletComponentItem(component);
|
||||
org.talend.core.model.properties.Project project = ProjectManager.getInstance()
|
||||
.getProject(jobletProperty);
|
||||
String projTechLabel = null;
|
||||
if (project != null) {
|
||||
projTechLabel = project.getTechnicalLabel();
|
||||
}
|
||||
String componentProcessId = jobletProperty.getId();
|
||||
component = service.setPropertyForJobletComponent(projTechLabel, componentProcessId,
|
||||
jobletVersion);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -25,6 +25,7 @@ import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.eclipse.emf.common.util.EList;
|
||||
import org.eclipse.emf.ecore.util.EcoreUtil;
|
||||
import org.eclipse.jface.dialogs.MessageDialog;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
@@ -41,7 +42,9 @@ import org.talend.core.PluginChecker;
|
||||
import org.talend.core.model.components.ComponentCategory;
|
||||
import org.talend.core.model.components.IComponent;
|
||||
import org.talend.core.model.context.ContextUtils;
|
||||
import org.talend.core.model.context.JobContext;
|
||||
import org.talend.core.model.context.JobContextManager;
|
||||
import org.talend.core.model.context.JobContextParameter;
|
||||
import org.talend.core.model.metadata.IEbcdicConstant;
|
||||
import org.talend.core.model.metadata.IMetadataColumn;
|
||||
import org.talend.core.model.metadata.IMetadataTable;
|
||||
@@ -175,122 +178,207 @@ public class ProcessUpdateManager extends AbstractUpdateManager {
|
||||
private List<UpdateResult> checkGroupContext(boolean onlySimpleShow) {
|
||||
List<UpdateResult> contextResults = new ArrayList<UpdateResult>();
|
||||
final IContextManager contextManager = getProcess().getContextManager();
|
||||
List<IContext> addGroupContext = ((JobContextManager) contextManager).getAddGroupContext();
|
||||
Map<ContextItem, List<IContext>> addContextGroupMap = ((JobContextManager) contextManager).getAddContextGroupMap();
|
||||
if (contextManager instanceof JobContextManager) {
|
||||
List<IProcess2> openedProcesses = UpdateManagerUtils.getOpenedProcess();
|
||||
if (((JobContextManager) contextManager).isConfigContextGroup()) {
|
||||
// add,remove/rename context group map is only filled when change it in the context group dialog of
|
||||
// repository
|
||||
List<IContext> addGroupContext = ((JobContextManager) contextManager).getAddGroupContext();
|
||||
Map<ContextItem, List<IContext>> addContextGroupMap = ((JobContextManager) contextManager)
|
||||
.getAddContextGroupMap();
|
||||
|
||||
List<IContext> removeGroupContext = ((JobContextManager) contextManager).getRemoveGroupContext();
|
||||
Map<ContextItem, List<IContext>> removeContextGroupMap = ((JobContextManager) contextManager).getRemoveContextGroupMap();
|
||||
List<IContext> removeGroupContext = ((JobContextManager) contextManager).getRemoveGroupContext();
|
||||
Map<ContextItem, List<IContext>> removeContextGroupMap = ((JobContextManager) contextManager)
|
||||
.getRemoveContextGroupMap();
|
||||
|
||||
Map<IContext, String> renameGroupContext = ((JobContextManager) contextManager).getRenameGroupContext();
|
||||
Map<ContextItem, List<IContext>> renameContextGroupMap = ((JobContextManager) contextManager).getRenameContextGroupMap();
|
||||
Map<IContext, String> renameGroupContext = ((JobContextManager) contextManager).getRenameGroupContext();
|
||||
Map<ContextItem, List<IContext>> renameContextGroupMap = ((JobContextManager) contextManager)
|
||||
.getRenameContextGroupMap();
|
||||
|
||||
List<IContext> listContext = contextManager.getListContext();
|
||||
List<IContext> listContext = contextManager.getListContext();
|
||||
|
||||
List<IProcess2> openedProcesses = UpdateManagerUtils.getOpenedProcess();
|
||||
for (ContextItem item : addContextGroupMap.keySet()) {
|
||||
|
||||
for (ContextItem item : addContextGroupMap.keySet()) {
|
||||
List<IContext> existedContextGroup = new ArrayList<IContext>();
|
||||
|
||||
List<IContext> existedContextGroup = new ArrayList<IContext>();
|
||||
if (addGroupContext.size() > 0) {
|
||||
for (int i = 0; i < addGroupContext.size(); i++) {
|
||||
IContext context = addGroupContext.get(i);
|
||||
for (int j = 0; j < listContext.size(); j++) {
|
||||
if (context.getName().equals(listContext.get(j).getName())) {
|
||||
existedContextGroup.add(context);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
addGroupContext.removeAll(existedContextGroup);
|
||||
}
|
||||
|
||||
if (addGroupContext.size() > 0) {
|
||||
for (int i = 0; i < addGroupContext.size(); i++) {
|
||||
IContext context = addGroupContext.get(i);
|
||||
for (int j = 0; j < listContext.size(); j++) {
|
||||
if (context.getName().equals(listContext.get(j).getName())) {
|
||||
existedContextGroup.add(context);
|
||||
break;
|
||||
if (addGroupContext.size() > 0) {
|
||||
for (IContext context : addGroupContext) {
|
||||
|
||||
UpdateCheckResult result = new UpdateCheckResult(context);
|
||||
String remark = UpdateRepositoryUtils.getRepositorySourceName(item);
|
||||
result.setResult(EUpdateItemType.CONTEXT_GROUP, EUpdateResult.ADD, item, remark);
|
||||
if (!openedProcesses.contains(getProcess())) {
|
||||
result.setFromItem(true);
|
||||
}
|
||||
result.setJob(getProcess());
|
||||
setConfigrationForReadOnlyJob(result);
|
||||
contextResults.add(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
addGroupContext.removeAll(existedContextGroup);
|
||||
}
|
||||
|
||||
if (addGroupContext.size() > 0) {
|
||||
for (IContext context : addGroupContext) {
|
||||
for (ContextItem item : removeContextGroupMap.keySet()) {
|
||||
|
||||
UpdateCheckResult result = new UpdateCheckResult(context);
|
||||
String remark = UpdateRepositoryUtils.getRepositorySourceName(item);
|
||||
result.setResult(EUpdateItemType.CONTEXT_GROUP, EUpdateResult.ADD, item, remark);
|
||||
if (!openedProcesses.contains(getProcess())) {
|
||||
result.setFromItem(true);
|
||||
List<IContext> notExistedContextGroup = new ArrayList<IContext>();
|
||||
|
||||
if (removeGroupContext.size() > 0) {
|
||||
for (int i = 0; i < removeGroupContext.size(); i++) {
|
||||
IContext context = removeGroupContext.get(i);
|
||||
boolean haveFound = false;
|
||||
for (int j = 0; j < listContext.size(); j++) {
|
||||
if (context.getName().equals(listContext.get(j).getName())) {
|
||||
haveFound = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!haveFound) {
|
||||
notExistedContextGroup.add(context);
|
||||
}
|
||||
}
|
||||
removeGroupContext.removeAll(notExistedContextGroup);
|
||||
}
|
||||
result.setJob(getProcess());
|
||||
setConfigrationForReadOnlyJob(result);
|
||||
contextResults.add(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (ContextItem item : removeContextGroupMap.keySet()) {
|
||||
if (removeGroupContext.size() > 0) {
|
||||
for (IContext context : removeGroupContext) {
|
||||
|
||||
List<IContext> notExistedContextGroup = new ArrayList<IContext>();
|
||||
|
||||
if (removeGroupContext.size() > 0) {
|
||||
for (int i = 0; i < removeGroupContext.size(); i++) {
|
||||
IContext context = removeGroupContext.get(i);
|
||||
boolean haveFound = false;
|
||||
for (int j = 0; j < listContext.size(); j++) {
|
||||
if (context.getName().equals(listContext.get(j).getName())) {
|
||||
haveFound = true;
|
||||
break;
|
||||
UpdateCheckResult result = new UpdateCheckResult(context);
|
||||
String remark = UpdateRepositoryUtils.getRepositorySourceName(item);
|
||||
result.setResult(EUpdateItemType.CONTEXT_GROUP, EUpdateResult.DELETE, item, remark);
|
||||
if (!openedProcesses.contains(getProcess())) {
|
||||
result.setFromItem(true);
|
||||
}
|
||||
result.setJob(getProcess());
|
||||
setConfigrationForReadOnlyJob(result);
|
||||
contextResults.add(result);
|
||||
}
|
||||
}
|
||||
if (!haveFound) {
|
||||
notExistedContextGroup.add(context);
|
||||
}
|
||||
}
|
||||
removeGroupContext.removeAll(notExistedContextGroup);
|
||||
}
|
||||
|
||||
if (removeGroupContext.size() > 0) {
|
||||
for (IContext context : removeGroupContext) {
|
||||
Map<IContext, String> temRenameGroupContext = new HashMap<IContext, String>();
|
||||
temRenameGroupContext.putAll(renameGroupContext);
|
||||
for (ContextItem item : renameContextGroupMap.keySet()) {
|
||||
|
||||
UpdateCheckResult result = new UpdateCheckResult(context);
|
||||
String remark = UpdateRepositoryUtils.getRepositorySourceName(item);
|
||||
result.setResult(EUpdateItemType.CONTEXT_GROUP, EUpdateResult.DELETE, item, remark);
|
||||
if (!openedProcesses.contains(getProcess())) {
|
||||
result.setFromItem(true);
|
||||
}
|
||||
result.setJob(getProcess());
|
||||
setConfigrationForReadOnlyJob(result);
|
||||
contextResults.add(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Map<IContext, String> temRenameGroupContext = new HashMap<IContext, String>();
|
||||
temRenameGroupContext.putAll(renameGroupContext);
|
||||
for (ContextItem item : renameContextGroupMap.keySet()) {
|
||||
|
||||
if (renameGroupContext.size() > 0) {
|
||||
for (IContext context : temRenameGroupContext.keySet()) {
|
||||
// IContext context = renameGroupContext.get(i);
|
||||
boolean haveFound = false;
|
||||
for (int j = 0; j < listContext.size(); j++) {
|
||||
if (temRenameGroupContext.get(context).equals(listContext.get(j).getName())) {
|
||||
haveFound = true;
|
||||
break;
|
||||
if (renameGroupContext.size() > 0) {
|
||||
for (IContext context : temRenameGroupContext.keySet()) {
|
||||
// IContext context = renameGroupContext.get(i);
|
||||
boolean haveFound = false;
|
||||
for (int j = 0; j < listContext.size(); j++) {
|
||||
if (temRenameGroupContext.get(context).equals(listContext.get(j).getName())) {
|
||||
haveFound = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!haveFound) {
|
||||
renameGroupContext.remove(context);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!haveFound) {
|
||||
renameGroupContext.remove(context);
|
||||
|
||||
if (renameGroupContext.size() > 0) {
|
||||
for (IContext context : renameGroupContext.keySet()) {
|
||||
|
||||
UpdateCheckResult result = new UpdateCheckResult(context);
|
||||
String remark = UpdateRepositoryUtils.getRepositorySourceName(item);
|
||||
result.setResult(EUpdateItemType.CONTEXT_GROUP, EUpdateResult.RENAME, item, remark);
|
||||
if (!openedProcesses.contains(getProcess())) {
|
||||
result.setFromItem(true);
|
||||
}
|
||||
result.setJob(getProcess());
|
||||
setConfigrationForReadOnlyJob(result);
|
||||
contextResults.add(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (renameGroupContext.size() > 0) {
|
||||
for (IContext context : renameGroupContext.keySet()) {
|
||||
|
||||
UpdateCheckResult result = new UpdateCheckResult(context);
|
||||
String remark = UpdateRepositoryUtils.getRepositorySourceName(item);
|
||||
result.setResult(EUpdateItemType.CONTEXT_GROUP, EUpdateResult.RENAME, item, remark);
|
||||
if (!openedProcesses.contains(getProcess())) {
|
||||
result.setFromItem(true);
|
||||
}
|
||||
result.setJob(getProcess());
|
||||
setConfigrationForReadOnlyJob(result);
|
||||
contextResults.add(result);
|
||||
}else {
|
||||
// only handle added groups
|
||||
Set<String> contextSourceChecked = new HashSet<String>();
|
||||
Set<String> processContextGroups = new HashSet<String>();
|
||||
for (IContext contextGroup : contextManager.getListContext()) {
|
||||
processContextGroups.add(contextGroup.getName());
|
||||
}
|
||||
IContext defaultContext = contextManager.getDefaultContext();
|
||||
Set<String> processContextVars = new HashSet<String>();
|
||||
for (IContextParameter param : defaultContext.getContextParameterList()) {
|
||||
processContextVars.add(param.getName());
|
||||
}
|
||||
Map<String, JobContext> newGroupMap = new HashMap<>();
|
||||
for (IContextParameter param : defaultContext.getContextParameterList()) {
|
||||
if (!param.isBuiltIn()) {
|
||||
String source = param.getSource();
|
||||
if (contextSourceChecked.contains(source)) {
|
||||
continue;
|
||||
}
|
||||
contextSourceChecked.add(source);
|
||||
final Item contextItem = ContextUtils.getRepositoryContextItemById(source);
|
||||
if (contextItem != null) {
|
||||
if (contextItem instanceof ContextItem) {
|
||||
EList contexts = ((ContextItem) contextItem).getContext();
|
||||
for (Object context : contexts) {
|
||||
if (context instanceof ContextType) {
|
||||
String groupName = ((ContextType) context).getName();
|
||||
JobContext newJobContext = null;
|
||||
if (!processContextGroups.contains(groupName)) {
|
||||
newJobContext = new JobContext(groupName);
|
||||
List<IContextParameter> newParamList = new ArrayList<IContextParameter>();
|
||||
newJobContext.setContextParameterList(newParamList);
|
||||
for (Object contextParamType : ((ContextType) context).getContextParameter()) {
|
||||
ContextParameterType contextImpl = (ContextParameterType) contextParamType;
|
||||
if (processContextVars.contains(contextImpl.getName())) {
|
||||
JobContextParameter jobContextParam = new JobContextParameter();
|
||||
ContextUtils.updateParameter(contextImpl, jobContextParam);
|
||||
jobContextParam.setSource(source);
|
||||
jobContextParam.setContext(newJobContext);
|
||||
newJobContext.getContextParameterList().add(jobContextParam);
|
||||
}
|
||||
}
|
||||
newGroupMap.put(groupName, newJobContext);
|
||||
UpdateCheckResult result = new UpdateCheckResult(newJobContext);
|
||||
String remark = UpdateRepositoryUtils.getRepositorySourceName(contextItem);
|
||||
result.setResult(EUpdateItemType.CONTEXT_GROUP, EUpdateResult.ADD, contextItem,
|
||||
remark);
|
||||
if (!openedProcesses.contains(getProcess())) {
|
||||
result.setFromItem(true);
|
||||
}
|
||||
result.setJob(getProcess());
|
||||
setConfigrationForReadOnlyJob(result);
|
||||
contextResults.add(result);
|
||||
} else {
|
||||
newJobContext = newGroupMap.get(groupName);
|
||||
if (newJobContext != null) {
|
||||
for (Object contextParamType : ((ContextType) context).getContextParameter()) {
|
||||
ContextParameterType contextImpl = (ContextParameterType) contextParamType;
|
||||
if (processContextVars.contains(contextImpl.getName())
|
||||
&& newJobContext.getContextParameter(contextImpl.getName()) == null) {
|
||||
JobContextParameter jobContextParam = new JobContextParameter();
|
||||
ContextUtils.updateParameter(contextImpl, jobContextParam);
|
||||
jobContextParam.setSource(source);
|
||||
jobContextParam.setContext(newJobContext);
|
||||
newJobContext.getContextParameterList().add(jobContextParam);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -322,6 +410,8 @@ public class ProcessUpdateManager extends AbstractUpdateManager {
|
||||
|
||||
List<IProcess2> openedProcesses = UpdateManagerUtils.getOpenedProcess();
|
||||
|
||||
Map<ContextItem, Set<String>> existedParams = new HashMap<ContextItem, Set<String>>();
|
||||
|
||||
for (IContext context : contextManager.getListContext()) {
|
||||
for (IContextParameter param : context.getContextParameterList()) {
|
||||
if (!param.isBuiltIn()) {
|
||||
@@ -351,6 +441,11 @@ public class ProcessUpdateManager extends AbstractUpdateManager {
|
||||
final ContextParameterType contextParameterType = ContextUtils.getContextParameterTypeByName(
|
||||
contextType, paramName);
|
||||
if (contextParameterType != null) {
|
||||
ContextItem repositoryContext = (ContextItem) contextItem;
|
||||
if (existedParams.get(contextItem) == null) {
|
||||
existedParams.put(repositoryContext, new HashSet<String>());
|
||||
}
|
||||
existedParams.get(repositoryContext).add(paramName);
|
||||
if (onlySimpleShow
|
||||
|| !ContextUtils.samePropertiesForContextParameter(param, contextParameterType)) {
|
||||
unsameMap.add(contextItem, paramName);
|
||||
@@ -416,6 +511,7 @@ public class ProcessUpdateManager extends AbstractUpdateManager {
|
||||
}
|
||||
}
|
||||
}
|
||||
checkNewAddParameterForRef(existedParams, contextManager, ContextUtils.isPropagateContextVariable());
|
||||
// see 0004661: Add an option to propagate when add or remove a variable in a repository context to
|
||||
// jobs/joblets.
|
||||
checkPropagateContextVariable(contextResults, contextManager, deleteParams, allContextItem, refContextIds);
|
||||
@@ -468,6 +564,30 @@ public class ProcessUpdateManager extends AbstractUpdateManager {
|
||||
return contextResults;
|
||||
}
|
||||
|
||||
private void checkNewAddParameterForRef(Map<ContextItem, Set<String>> existedParams, final IContextManager contextManager,
|
||||
boolean isPropagateContextVariable) {
|
||||
if (!isPropagateContextVariable) {
|
||||
return;
|
||||
}
|
||||
|
||||
Map<ContextItem, Set<String>> newParametersMap = ((JobContextManager) contextManager).getNewParametersMap();
|
||||
for (ContextItem contextItem : existedParams.keySet()) {
|
||||
ContextType contextType = ContextUtils.getContextTypeByName((ContextItem) contextItem,
|
||||
contextItem.getDefaultContext(), true);
|
||||
List<ContextParameterType> contextParameter = contextType.getContextParameter();
|
||||
Set<String> existedParName = existedParams.get(contextItem);
|
||||
for (ContextParameterType parameterType : contextParameter) {
|
||||
if (!existedParName.contains(parameterType.getName())) {
|
||||
if (newParametersMap.get(contextItem) == null) {
|
||||
newParametersMap.put(contextItem, new HashSet<String>());
|
||||
}
|
||||
newParametersMap.get(contextItem).add(parameterType.getName());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* propagate when add or remove a variable in a repository context to jobs/joblets.
|
||||
*
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
package org.talend.designer.core.ui.editor.properties;
|
||||
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.apache.oro.text.regex.MalformedPatternException;
|
||||
import org.apache.oro.text.regex.PatternCompiler;
|
||||
@@ -59,7 +58,9 @@ public final class NodeQueryCheckUtil {
|
||||
// split the function
|
||||
private static final String FUNC_SPLIT = "(\\s)*(\\w*)\\((.*?)\\)(\\s+\\w*){0,1}"; //$NON-NLS-1$
|
||||
|
||||
private static final String COMMENT_REGX_PATTERN = ("(?ms)('(?:''|[^'])*')|--.*?$|/\\*.*?\\*/"); //$NON-NLS-1$
|
||||
private static final String COMMENT_REGX_PATTERN = ("(?ms)('(?:''|[^'])*')|--.*?$|/\\*.*?\\*/"); //$NON-NLS-1$
|
||||
|
||||
private static boolean needMatchQuery;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -70,14 +71,10 @@ public final class NodeQueryCheckUtil {
|
||||
* @return
|
||||
*/
|
||||
public static boolean checkQueryOK(Node node, String sql) {
|
||||
setNeedMatchQuery(false);
|
||||
if (sql == null) {
|
||||
return false;
|
||||
}
|
||||
// match the query comments
|
||||
Pattern commentRegex = Pattern.compile(COMMENT_REGX_PATTERN);
|
||||
Matcher commentMatcher = commentRegex.matcher(sql);
|
||||
sql = commentMatcher.replaceAll("");
|
||||
|
||||
// replace the new line char
|
||||
sql = sql.replaceAll("\r", " "); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
sql = sql.replaceAll("\n", " "); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
@@ -106,17 +103,11 @@ public final class NodeQueryCheckUtil {
|
||||
if ("*".equals(columns)) { //$NON-NLS-1$
|
||||
return true;
|
||||
}
|
||||
/*
|
||||
* add by wzhang
|
||||
*/
|
||||
boolean match = apacheRegexMatch(SQL_FUNC_REGX, REGX_FLAG, columns);
|
||||
if (!match) {
|
||||
// no function
|
||||
return compareNodeTableColumnsNoFunc(node, columns);
|
||||
} else {
|
||||
// contains function
|
||||
return compareNodeTableColumnsWithFunc(node, columns);
|
||||
boolean result = compareNodeTableColumns(node, columns);
|
||||
if (!result) {
|
||||
setNeedMatchQuery(!result);
|
||||
}
|
||||
return result;
|
||||
|
||||
}
|
||||
|
||||
@@ -214,4 +205,33 @@ public final class NodeQueryCheckUtil {
|
||||
}
|
||||
}
|
||||
|
||||
public static String matchQueryComments(Node node, String sql) {
|
||||
if (sql == null) {
|
||||
return null;
|
||||
}
|
||||
if (sql.contains("--") || sql.contains("/*")) {//$NON-NLS-1$ //$NON-NLS-2$
|
||||
// match the query comments
|
||||
return sql.replaceAll(COMMENT_REGX_PATTERN, ""); //$NON-NLS-1$
|
||||
}
|
||||
return sql;
|
||||
}
|
||||
|
||||
private static boolean compareNodeTableColumns(Node node, String columns) {
|
||||
boolean match = apacheRegexMatch(SQL_FUNC_REGX, REGX_FLAG, columns);
|
||||
if (!match) {
|
||||
// no function
|
||||
return compareNodeTableColumnsNoFunc(node, columns);
|
||||
} else {
|
||||
// contains function
|
||||
return compareNodeTableColumnsWithFunc(node, columns);
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean isNeedMatchQuery() {
|
||||
return needMatchQuery;
|
||||
}
|
||||
|
||||
public static void setNeedMatchQuery(boolean matchQuery) {
|
||||
needMatchQuery = matchQuery;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,6 +37,7 @@ import org.eclipse.swt.widgets.Shell;
|
||||
import org.eclipse.swt.widgets.Tree;
|
||||
import org.eclipse.swt.widgets.TreeColumn;
|
||||
import org.eclipse.ui.dialogs.SelectionDialog;
|
||||
import org.talend.core.model.context.JobContext;
|
||||
import org.talend.core.model.properties.ConnectionItem;
|
||||
import org.talend.core.model.update.EUpdateItemType;
|
||||
import org.talend.core.model.update.EUpdateResult;
|
||||
@@ -74,7 +75,7 @@ public class UpdateDetectionDialog extends SelectionDialog {
|
||||
private static final int SIZING_COLUMN_WIDTH = 25;
|
||||
|
||||
private List<UpdateResult> inputElement;
|
||||
|
||||
|
||||
private List<UpdateResult> selectedElement;
|
||||
|
||||
private CheckboxTreeViewer viewer;
|
||||
@@ -167,10 +168,14 @@ public class UpdateDetectionDialog extends SelectionDialog {
|
||||
tempItems.add(item);
|
||||
}
|
||||
} else if (result.getUpdateType() == EUpdateItemType.CONTEXT_GROUP) {
|
||||
if (contextGroups.contains(result.getJobInfor())) {
|
||||
String key = result.getJobInfor();
|
||||
if (result.getUpdateObject() instanceof JobContext) {
|
||||
key = key + ((JobContext) result.getUpdateObject()).getName();
|
||||
}
|
||||
if (contextGroups.contains(key)) {
|
||||
duplicatedResult.add(result);
|
||||
} else {
|
||||
contextGroups.add(result.getJobInfor());
|
||||
contextGroups.add(key);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -521,23 +526,23 @@ public class UpdateDetectionDialog extends SelectionDialog {
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private List<UpdateResult> getCheckedElements(){
|
||||
|
||||
private List<UpdateResult> getCheckedElements() {
|
||||
Object[] objs = getViewer().getCheckedElements();
|
||||
List<UpdateResult> results = new ArrayList<UpdateResult>();
|
||||
if(objs != null){
|
||||
for(Object obj:objs){
|
||||
if(obj instanceof UpdateResult){
|
||||
results.add((UpdateResult)obj);
|
||||
}else if(obj instanceof Item){
|
||||
results.add(((Item)obj).getResultObject());
|
||||
if (objs != null) {
|
||||
for (Object obj : objs) {
|
||||
if (obj instanceof UpdateResult) {
|
||||
results.add((UpdateResult) obj);
|
||||
} else if (obj instanceof Item) {
|
||||
results.add(((Item) obj).getResultObject());
|
||||
}
|
||||
}
|
||||
}
|
||||
return results;
|
||||
}
|
||||
|
||||
public List<UpdateResult> getSelectedElements(){
|
||||
|
||||
public List<UpdateResult> getSelectedElements() {
|
||||
return selectedElement;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -180,7 +180,8 @@ public class JavaProcessUtil {
|
||||
if (nodeNeededModules != null) {
|
||||
modulesNeeded.addAll(nodeNeededModules);
|
||||
if (node.getComponent().getName().equals("tLibraryLoad")) { //$NON-NLS-1$
|
||||
LastGenerationInfo.getInstance().getHighPriorityModuleNeeded().addAll(nodeNeededModules);
|
||||
LastGenerationInfo.getInstance().setHighPriorityModuleNeeded(process.getId(),process.getVersion(),
|
||||
nodeNeededModules);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.dbmap</artifactId>
|
||||
|
||||
@@ -680,13 +680,14 @@ public abstract class DbGenerationManager {
|
||||
if (operatorIsSet) {
|
||||
|
||||
if (writeCr) {
|
||||
sbWhere.append(DbMapSqlConstants.NEW_LINE).append(tabSpaceString);
|
||||
sbWhere.append(DbMapSqlConstants.SPACE);
|
||||
appendSqlQuery(sbWhere, DbMapSqlConstants.NEW_LINE);
|
||||
appendSqlQuery(sbWhere, tabSpaceString);
|
||||
appendSqlQuery(sbWhere, DbMapSqlConstants.SPACE);
|
||||
}
|
||||
if (!isFirstClause) {
|
||||
sbWhere.append(DbMapSqlConstants.SPACE);
|
||||
sbWhere.append(DbMapSqlConstants.AND);
|
||||
sbWhere.append(DbMapSqlConstants.SPACE);
|
||||
appendSqlQuery(sbWhere, DbMapSqlConstants.SPACE);
|
||||
appendSqlQuery(sbWhere, DbMapSqlConstants.AND);
|
||||
appendSqlQuery(sbWhere, DbMapSqlConstants.SPACE);
|
||||
}
|
||||
String entryName = dbMapEntry.getName();
|
||||
entryName = getOriginalColumnName(entryName, component, table);
|
||||
@@ -697,30 +698,31 @@ public abstract class DbGenerationManager {
|
||||
tableName = getHandledField(table.getAlias());
|
||||
}
|
||||
String locationInputEntry = language.getLocation(tableName, getHandledField(entryName));
|
||||
sbWhere.append(DbMapSqlConstants.SPACE);
|
||||
sbWhere.append(locationInputEntry);
|
||||
sbWhere.append(getSpecialRightJoin(table));
|
||||
appendSqlQuery(sbWhere, DbMapSqlConstants.SPACE);
|
||||
appendSqlQuery(sbWhere, locationInputEntry);
|
||||
appendSqlQuery(sbWhere, getSpecialRightJoin(table));
|
||||
|
||||
sbWhere.append(DbMapSqlConstants.SPACE);
|
||||
appendSqlQuery(sbWhere, DbMapSqlConstants.SPACE);
|
||||
if (operatorIsSet) {
|
||||
sbWhere.append(dbOperator.getOperator()).append(DbMapSqlConstants.SPACE);
|
||||
appendSqlQuery(sbWhere, dbOperator.getOperator());
|
||||
appendSqlQuery(sbWhere, DbMapSqlConstants.SPACE);
|
||||
} else if (!operatorIsSet && expressionIsSet) {
|
||||
sbWhere.append(DbMapSqlConstants.LEFT_COMMENT);
|
||||
sbWhere.append(DbMapSqlConstants.SPACE);
|
||||
sbWhere.append(Messages.getString("DbGenerationManager.InputOperationSetMessage", entryName)); //$NON-NLS-1$
|
||||
sbWhere.append(DbMapSqlConstants.SPACE);
|
||||
sbWhere.append(DbMapSqlConstants.RIGHT_COMMENT);
|
||||
appendSqlQuery(sbWhere, DbMapSqlConstants.LEFT_COMMENT);
|
||||
appendSqlQuery(sbWhere, DbMapSqlConstants.SPACE);
|
||||
appendSqlQuery(sbWhere, Messages.getString("DbGenerationManager.InputOperationSetMessage", entryName));
|
||||
appendSqlQuery(sbWhere, DbMapSqlConstants.SPACE);
|
||||
appendSqlQuery(sbWhere, DbMapSqlConstants.RIGHT_COMMENT);
|
||||
}
|
||||
if (operatorIsSet && !expressionIsSet && !dbOperator.isMonoOperand()) {
|
||||
String str = table.getName() + DbMapSqlConstants.DOT + entryName;
|
||||
sbWhere.append(DbMapSqlConstants.LEFT_COMMENT);
|
||||
sbWhere.append(DbMapSqlConstants.SPACE);
|
||||
sbWhere.append(Messages.getString("DbGenerationManager.InputExpSetMessage", str)); //$NON-NLS-1$
|
||||
sbWhere.append(DbMapSqlConstants.SPACE);
|
||||
sbWhere.append(DbMapSqlConstants.RIGHT_COMMENT);
|
||||
appendSqlQuery(sbWhere, DbMapSqlConstants.LEFT_COMMENT);
|
||||
appendSqlQuery(sbWhere, DbMapSqlConstants.SPACE);
|
||||
appendSqlQuery(sbWhere, Messages.getString("DbGenerationManager.InputExpSetMessage", str));
|
||||
appendSqlQuery(sbWhere, DbMapSqlConstants.SPACE);
|
||||
appendSqlQuery(sbWhere, DbMapSqlConstants.RIGHT_COMMENT);
|
||||
} else if (expressionIsSet) {
|
||||
sbWhere.append(expression);
|
||||
sbWhere.append(getSpecialLeftJoin(table));
|
||||
appendSqlQuery(sbWhere, expression);
|
||||
appendSqlQuery(sbWhere, getSpecialLeftJoin(table));
|
||||
}
|
||||
conditionWritten = true;
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.documentation</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.filemultischemas</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.fileoutputxml</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.gefabstractmap</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.hl7</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.mapper.advanced</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.mapper</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.job</artifactId>
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
<talend.project.name>@ProjectName@</talend.project.name>
|
||||
<talend.project.name.lowercase>@ProjectName@</talend.project.name.lowercase>
|
||||
<talend.project.id>@ProjectId@</talend.project.id>
|
||||
<talend.project.branch>@ProjectBranch@</talend.project.branch>
|
||||
<talend.job.name>@JobName@</talend.job.name>
|
||||
<talend.job.version>@TalendJobVersion@</talend.job.version>
|
||||
<talend.job.date>@JobDate@</talend.job.date>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.publish.core</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.rowgenerator</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.runprocess</artifactId>
|
||||
|
||||
@@ -13,14 +13,11 @@
|
||||
package org.talend.designer.runprocess.java;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.TreeSet;
|
||||
|
||||
@@ -246,7 +243,8 @@ public class JavaProcessorUtilities {
|
||||
}
|
||||
}
|
||||
// move high priority modules to front.
|
||||
Set<ModuleNeeded> highPriorityModuleNeeded = LastGenerationInfo.getInstance().getHighPriorityModuleNeeded();
|
||||
Set<ModuleNeeded> highPriorityModuleNeeded = LastGenerationInfo.getInstance()
|
||||
.getHighPriorityModuleNeeded(property.getId(), property.getVersion());
|
||||
if (!highPriorityModuleNeeded.isEmpty()) {
|
||||
Iterator<ModuleNeeded> iterator = highPriorityModuleNeeded.iterator();
|
||||
while (iterator.hasNext()) {
|
||||
@@ -256,10 +254,8 @@ public class JavaProcessorUtilities {
|
||||
}
|
||||
}
|
||||
// order should be main -> sub1 -> sub_sub1 -> normal modules
|
||||
List<ModuleNeeded> tempList = new ArrayList<>(highPriorityModuleNeeded);
|
||||
Collections.reverse(tempList);
|
||||
Set<ModuleNeeded> orderedNeededLibraries = new LinkedHashSet<>();
|
||||
orderedNeededLibraries.addAll(tempList);
|
||||
orderedNeededLibraries.addAll(highPriorityModuleNeeded);
|
||||
orderedNeededLibraries.addAll(neededLibraries);
|
||||
return orderedNeededLibraries;
|
||||
}
|
||||
@@ -496,7 +492,7 @@ public class JavaProcessorUtilities {
|
||||
|
||||
});
|
||||
}
|
||||
} else {
|
||||
} else if (!Boolean.getBoolean("skip_missing_jars")) {
|
||||
throw new ProcessorException(missingJars);
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.runtime.visualization.tools</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.runtime.visualization</artifactId>
|
||||
|
||||
@@ -1,6 +1,25 @@
|
||||
collapseAllLabel=\u5168\u3066\u7573\u3080
|
||||
copyLabel=\u30B3\u30D4\u30FC
|
||||
refreshLabel=\u66F4\u65B0
|
||||
preferencesLabel=\u74B0\u5883\u8A2D\u5B9A...
|
||||
showInTimelineLabel=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u306B\u8868\u793A...
|
||||
openDeclarationLabel=\u5BA3\u8A00\u3092&\u958B\u304F
|
||||
verticalOrientationLabel=\u5782\u76F4\u65B9\u5411\u306E\u5411\u304D
|
||||
horizontalOrientationLabel=\u6C34\u5E73\u65B9\u5411\u306E\u5411\u304D
|
||||
automaticOrientationLabel=\u81EA\u52D5\u65B9\u5411
|
||||
singleOrientationLabel=\u5358\u4E00\u914D\u5411
|
||||
configureColumnsLabel=\u30AB\u30E9\u30E0\u306E\u8A2D\u5B9A...
|
||||
configureColumnsTitle=\u30AB\u30E9\u30E0\u306E\u8A2D\u5B9A
|
||||
configureColumnsMessage=\u8868\u793A\u30AB\u30E9\u30E0\u3092\u9078\u629E\u3057\u3001\u30BD\u30FC\u30C8\u3057\u307E\u3059:
|
||||
upLabel=\u30A2\u30C3\u30D7
|
||||
downLabel=\u30C0\u30A6\u30F3
|
||||
selectAllLabel=\u5168\u3066\u9078\u629E
|
||||
deselectAllLabel=\u9078\u629E\u3092\u89E3\u9664
|
||||
showInTimelineDialogTitle=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u3092\u8868\u793A
|
||||
searchingSoruceMsg=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u4ED8\u3051\u306B\u6642\u9593\u304C\u304B\u304B\u308B\u53EF\u80FD\u6027\u306E\u3042\u308B\u30BD\u30FC\u30B9\u306E\u691C\u7D22\u4E2D\u3002
|
||||
addAttributeFailedMsg=\u5C5E\u6027\u3092\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F: {0}
|
||||
openEditorFailedMsg=Java\u30A8\u30C7\u30A3\u30BF\u30FC\u3092\u958B\u304F\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
|
||||
highlightMethodFailedMsg=\u30E1\u30BD\u30C3\u30C9\u3092\u30CF\u30A4\u30E9\u30A4\u30C8\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
|
||||
searchClassFailedMsg=\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F: {0}
|
||||
openDeclarationFailedMsg=\u5BA3\u8A00\u3092\u958B\u304F\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\n\u30D5\u30A1\u30A4\u30EB\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F: {0}
|
||||
errorLabel=\u30A8\u30E9\u30FC
|
||||
|
||||
@@ -1,2 +1,29 @@
|
||||
createDirectoryFailedMsg=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F: {0}
|
||||
openOutputStreamFailedMsg={0}\u306E\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u3092\u958B\u304F\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
|
||||
writePropertiesFileFailedMsg=\u30D7\u30ED\u30D1\u30C6\u30A3\u3092{0}\u306B\u66F8\u304D\u8FBC\u3080\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
|
||||
getJmxServiceUrlForPidFailedMsg=JMX\u30B5\u30FC\u30D3\u30B9URL\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F(PID: {0})
|
||||
getJmxServiceUrlForPortFailedMsg=JMX\u30B5\u30FC\u30D3\u30B9URL\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F(\u30DD\u30FC\u30C8: {0})
|
||||
getJmxServiceUrlForUrlFailedMsg=JMX\u30B5\u30FC\u30D3\u30B9URL\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F(URL: {0})
|
||||
attachNotSupportedMsg=\u30BF\u30FC\u30B2\u30C3\u30C8JVM\u306B\u306F\u6DFB\u4ED8\u304C\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
|
||||
getPidFailedMsg=PID\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
|
||||
getHostNameFailedMsg=\u30DB\u30B9\u30C8\u540D\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
|
||||
savePropertiesFileFailedMsg=\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
|
||||
dumpCpuProfileDataFailedMsg=CPU\u30D7\u30ED\u30D5\u30A1\u30A4\u30EA\u30F3\u30B0\u30C7\u30FC\u30BF\u3092{0}\u306B\u30C0\u30F3\u30D7\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
|
||||
parseCpuDumpFailedMsg=CPU\u30C0\u30F3\u30D7\u3092\u89E3\u6790\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
|
||||
agentNotLoadedMsg=\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u304C\u30ED\u30FC\u30C9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
|
||||
removeJvmFailedMsg=JVM\u3092\u6B63\u3057\u304F\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F: {0}
|
||||
queryObjectNameFailedMsg=\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u540D\u306E\u30AF\u30A8\u30EA\u3092\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
|
||||
getAttributeFailedMsg=\u5C5E\u6027\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F: {0}
|
||||
setAttributeFailedMsg=\u5C5E\u6027\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F: {0}
|
||||
getMBeanInfoFailedMsg=MBean\u60C5\u5831\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
|
||||
getMBeanFailedMsg=MBean\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F: {0}
|
||||
mBeanOperationFailedMsg=MBean\u64CD\u4F5C\u304C\u5931\u6557\u3057\u307E\u3057\u305F: {0}
|
||||
dumpFailedMsg={0}\u306B\u30C0\u30F3\u30D7\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
|
||||
subscribeMBeanNotificationFailedMsg=MBean\u901A\u77E5\u3092\u30B5\u30D6\u30B9\u30AF\u30E9\u30A4\u30D6\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
|
||||
unsubscribeMBeanNotificationFailedMsg=MBean\u901A\u77E5\u3092\u767B\u9332\u89E3\u9664\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
|
||||
getObjectNameFailedMsg=ObjectName\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F: {0}
|
||||
connectToMBeanServerFailedMsg=MBean\u30B5\u30FC\u30D0\u30FC\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\u3002
|
||||
readFileFailedMsg=\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u53D6\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F: {0}
|
||||
renameFileFailedMsg=\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F: {0}
|
||||
jvmNotReachableMsg=JVM\u304C\u63A5\u7D9A\u89E3\u9664\u3055\u308C\u3066\u3044\u307E\u3059
|
||||
transformClassesTask=\u30D0\u30A4\u30C8\u30B3\u30FC\u30C9\u306E\u30A4\u30F3\u30B9\u30C8\u30EB\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
updatePeriodLabel=\u66F4\u65B0\u3059\u308B\u671F\u9593(\u30DF\u30EA\u79D2):
|
||||
showLegendLabel=\u51E1\u4F8B\u3092\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30C1\u30E3\u30FC\u30C8\u306B\u8868\u793A\u3057\u307E\u3059\u3002
|
||||
timelineGroupLabel=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3
|
||||
threadsGroupLabel=\u30B9\u30EC\u30C3\u30C9
|
||||
memoryGroupLabel=\u30E1\u30E2\u30EA
|
||||
wideScopeThreadFilterLabel=\u30B9\u30EC\u30C3\u30C9\u3092\u30D5\u30A3\u30EB\u30BF\u30EA\u30F3\u30B0\u3059\u308B\u3068\u304D\u306B\u3001\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3092\u8003\u616E\u3057\u307E\u3059\u3002
|
||||
wideScopeSWTResourceFilterLabel=SWT\u30EA\u30BD\u30FC\u30B9\u3092\u30D5\u30A3\u30EB\u30BF\u30EA\u30F3\u30B0\u3059\u308B\u3068\u304D\u306B\u3001\u30B9\u30BF\u30C3\u30AF\u30C8\u30EC\u30FC\u30B9\u3092\u8003\u616E\u3057\u307E\u3059\u3002
|
||||
updatePeriodNotEnteredMsg=\u66F4\u65B0\u671F\u9593\u3092\u5165\u529B\u3057\u307E\u3059\u3002
|
||||
illegalUpdatePeriodMsg=\u66F4\u65B0\u671F\u9593\u304C\u7121\u52B9\u3067\u3059\u3002
|
||||
updatePeriodOutOfRangeMsg=\u66F4\u65B0\u671F\u9593\u306F100\u30DF\u30EA\u79D2\u3088\u308A\u3082\u9577\u304F\u8A2D\u5B9A\u3057\u3066\u4E0B\u3055\u3044\u3002
|
||||
@@ -1,4 +1,7 @@
|
||||
monitoringNotStartedMsg=\u9078\u629E\u3057\u305FJVM\u306E\u76E3\u8996\u304C\u958B\u59CB\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
|
||||
monitoringNotSupportedMsg=\u9078\u629E\u3057\u305FJVM\u306E\u76E3\u8996\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
|
||||
propertyColumnLabel=\u30D7\u30ED\u30D1\u30C6\u30A3
|
||||
propertyColumnToolTip=\u30D7\u30ED\u30D1\u30C6\u30A3
|
||||
valueColumnLabel=\u5024
|
||||
valueColumnToolTip=\u5024
|
||||
seeFaqMsg=FAQ\u3092\u53C2\u7167
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
removeHostFailedMsg=\u30DB\u30B9\u30C8\u3092\u6B63\u3057\u304F\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F: {0}
|
||||
removeFileFailedMsg=\u30D5\u30A1\u30A4\u30EB\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F: {0}
|
||||
removeDirectoryFailedMsg=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F: {0}
|
||||
openInputStreamFailedMsg={0}\u306E\u5165\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u3092\u958B\u304F\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
|
||||
loadPropertiesFileFailedMsg=\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5\u30A1\u30A4\u30EB\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F: {0}
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.scd</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.spss</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.tutorials</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.webservice</artifactId>
|
||||
|
||||
@@ -21,6 +21,7 @@ Require-Bundle: org.eclipse.ui,
|
||||
org.eclipse.xsd,
|
||||
org.apache.commons.lang,
|
||||
org.talend.libraries.apache,
|
||||
org.talend.libraries.dom4j-jaxen,
|
||||
org.talend.model;visibility:=reexport,
|
||||
org.talend.core.repository,
|
||||
org.talend.core,
|
||||
|
||||
@@ -9,7 +9,8 @@ bin.includes = .,\
|
||||
META-INF/,\
|
||||
plugin.xml,\
|
||||
plugin.properties,\
|
||||
icons/
|
||||
icons/,\
|
||||
resources/
|
||||
jars.compile.order = .
|
||||
source.. = src/main/java/
|
||||
output.. = class/
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>6.5.1-SNAPSHOT</version>
|
||||
<version>6.5.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.xmlmap</artifactId>
|
||||
|
||||
215
main/plugins/org.talend.designer.xmlmap/resources/tXMLMap.xsl
Normal file
215
main/plugins/org.talend.designer.xmlmap/resources/tXMLMap.xsl
Normal file
@@ -0,0 +1,215 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- edited with XMLSpy v2007 sp1 (http://www.altova.com) by () -->
|
||||
<xsl:stylesheet version="1.1"
|
||||
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
|
||||
<xsl:template match="/">
|
||||
<xsl:variable name="rootTable"
|
||||
select="externalNode/mapperTable" />
|
||||
<xsl:variable name="subRootTable"
|
||||
select="externalNode/mapperTable/rootTable/table" />
|
||||
|
||||
<b class="FONTSTYLE"><xsl:value-of select="/externalNode/@i18n.job.component.parameters" /></b>
|
||||
<br />
|
||||
<table class="cols" width="90%" border="1"
|
||||
cellpadding="0" cellspacing="0"
|
||||
style="border-collapse: collapse; padding-left:10mm;"
|
||||
bordercolor="#111111" frame="box" summary="">
|
||||
<tr>
|
||||
<th align="left" width="30%"
|
||||
class="TABLECOLUMNSTYLE">
|
||||
<xsl:value-of select="/externalNode/@i18n.job.properties" />
|
||||
</th>
|
||||
<th align="left" width="70%"
|
||||
class="TABLECOLUMNSTYLE">
|
||||
<xsl:value-of select="/externalNode/@i18n.job.values" />
|
||||
</th>
|
||||
</tr>
|
||||
<xsl:for-each select="/externalNode/parameters/column">
|
||||
<tr>
|
||||
<td class="FONTSTYLE" align="left">
|
||||
<xsl:variable name="propname"
|
||||
select="@name" />
|
||||
<xsl:value-of select="$propname" />
|
||||
</td>
|
||||
<td class="FONTSTYLE" align="left">
|
||||
<pre>
|
||||
<xsl:value-of select="text()" disable-output-escaping="yes"/>
|
||||
</pre>
|
||||
</td>
|
||||
</tr>
|
||||
</xsl:for-each>
|
||||
</table>
|
||||
<br />
|
||||
|
||||
|
||||
<xsl:for-each select="$rootTable">
|
||||
<b class="FONTSTYLE">
|
||||
<xsl:value-of select="/externalNode/@i18n.mapper.table.for" />
|
||||
<xsl:value-of select="/externalNode/@name" />
|
||||
(
|
||||
<xsl:value-of select="@type" />
|
||||
):
|
||||
</b>
|
||||
<br />
|
||||
<xsl:for-each select="table">
|
||||
<table border="0" width="96%" cellpadding="0"
|
||||
cellspacing="0" summary="">
|
||||
<tr>
|
||||
<td width="15"></td>
|
||||
<td>
|
||||
<b class="FONTSTYLE">
|
||||
<xsl:value-of select="/externalNode/@i18n.mapper.table.properties" />(
|
||||
<xsl:value-of select="@name" />
|
||||
):
|
||||
</b>
|
||||
<table class="cols" border="1" width="90%"
|
||||
cellpadding="0" cellspacing="0"
|
||||
style="border-collapse: collapse; padding-left:10mm;" bordercolor="#111111"
|
||||
frame="box" summary="">
|
||||
<tr>
|
||||
<th align="left" width="30%"
|
||||
class="TABLECOLUMNSTYLE">
|
||||
<xsl:value-of select="/externalNode/@i18n.job.properties" />
|
||||
</th>
|
||||
<th align="left" width="70%"
|
||||
class="TABLECOLUMNSTYLE">
|
||||
<xsl:value-of select="/externalNode/@i18n.job.values" />
|
||||
</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="FONTSTYLE"
|
||||
align="left">
|
||||
<xsl:value-of select="/externalNode/@i18n.job.name" />
|
||||
</td>
|
||||
<td class="FONTSTYLE"
|
||||
align="left">
|
||||
<xsl:value-of select="@name" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="FONTSTYLE"
|
||||
align="left">
|
||||
<xsl:value-of select="/externalNode/@i18n.tmap.matching.mode" />
|
||||
</td>
|
||||
<td class="FONTSTYLE"
|
||||
align="left">
|
||||
<xsl:value-of
|
||||
select="@matching-mode" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="FONTSTYLE"
|
||||
align="left">
|
||||
<xsl:value-of select="/externalNode/@i18n.mapper.table.isminimized" />
|
||||
</td>
|
||||
<td class="FONTSTYLE"
|
||||
align="left">
|
||||
<xsl:value-of
|
||||
select="@isMinimized" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="FONTSTYLE"
|
||||
align="left">
|
||||
<xsl:value-of select="/externalNode/@i18n.tmap.isreject" />
|
||||
</td>
|
||||
<td class="FONTSTYLE"
|
||||
align="left">
|
||||
<xsl:value-of
|
||||
select="@isReject" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="FONTSTYLE"
|
||||
align="left">
|
||||
<xsl:value-of select="/externalNode/@i18n.tmap.isrejectinnnerjoin" />
|
||||
</td>
|
||||
<td class="FONTSTYLE"
|
||||
align="left">
|
||||
<xsl:value-of
|
||||
select="@isRejectInnerJoin" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="FONTSTYLE"
|
||||
align="left">
|
||||
<xsl:value-of select="/externalNode/@i18n.tmap.isinnerjoin" />
|
||||
</td>
|
||||
<td class="FONTSTYLE"
|
||||
align="left">
|
||||
<xsl:value-of
|
||||
select="@isInnerJoin" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="FONTSTYLE"
|
||||
align="left">
|
||||
<xsl:value-of select="/externalNode/@i18n.tmap.expressionfilter" />
|
||||
</td>
|
||||
<td class="FONTSTYLE"
|
||||
align="left">
|
||||
<xsl:value-of
|
||||
select="@expressionFilter" />
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<br />
|
||||
<b class="FONTSTYLE">
|
||||
<xsl:value-of select="/externalNode/@i18n.mapper.table.metadata.entries" />(
|
||||
<xsl:value-of select="@name" />
|
||||
):
|
||||
</b>
|
||||
<br />
|
||||
<table class="cols" width="90%"
|
||||
cellpadding="0" border="1" cellspacing="0"
|
||||
style="border-collapse: collapse;table-layout:fixed; word-break:break-all;word-wrap:break-word;white-space:pre-wrap" bordercolor="#111111"
|
||||
frame="box" summary="">
|
||||
<tr class="profont">
|
||||
<th class="TABLECOLUMNSTYLE"
|
||||
width="25%">
|
||||
<xsl:value-of select="/externalNode/@i18n.job.name" />
|
||||
</th>
|
||||
<th class="TABLECOLUMNSTYLE"
|
||||
width="25%">
|
||||
<xsl:value-of select="/externalNode/@i18n.job.type" />
|
||||
</th>
|
||||
<th class="TABLECOLUMNSTYLE"
|
||||
width="25%">
|
||||
<xsl:value-of select="/externalNode/@i18n.mapper.table.expression" />
|
||||
</th>
|
||||
<th class="TABLECOLUMNSTYLE"
|
||||
width="25%">
|
||||
<xsl:value-of select="/externalNode/@i18n.tmap.isnullable" />
|
||||
</th>
|
||||
</tr>
|
||||
<xsl:for-each
|
||||
select="metadataTableEntries/entry">
|
||||
<tr class="FONTSTYLE">
|
||||
<td align="left">
|
||||
<xsl:value-of
|
||||
select="@name" />
|
||||
</td>
|
||||
<td align="left" >
|
||||
<xsl:value-of
|
||||
select="@type" />
|
||||
</td>
|
||||
<td align="left" >
|
||||
<xsl:value-of
|
||||
select="@expression" />
|
||||
</td>
|
||||
<td align="left" >
|
||||
<xsl:value-of
|
||||
select="@isNullable" />
|
||||
</td>
|
||||
</tr>
|
||||
</xsl:for-each>
|
||||
</table>
|
||||
<br />
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<br />
|
||||
</xsl:for-each>
|
||||
</xsl:for-each>
|
||||
</xsl:template>
|
||||
</xsl:stylesheet>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user