Compare commits

...

9 Commits

Author SHA1 Message Date
Yucheng Bai
21699748d1 fix(TUP-18146): https://jira.talendforge.org/browse/TUP-18146 (#1446)
* fix(TUP-18146) fix quote issue

* fix(TUP-18146): update junits.

* fix(TUP-18146): update junits.
2017-06-23 17:27:29 +08:00
mtuhai
5c9f7fa16c bug(TBD-5111/components): tBigQueryBulkExec component does not report error when failures happen - fixed (#1419) 2017-06-22 09:46:33 +02:00
zafkirTalend
660ba3714b fix(TBD-4990): Avoid NullPointerException when the component's flow connector is not shown (#1416) 2017-06-22 09:44:00 +02:00
zafkirTalend
94108609db fix(TBD-4990): Avoid NullPointerException when the component's flow connector is not shown (#1409) 2017-06-22 09:43:49 +02:00
Liu Xinquan
e9bcfa8af1 TDQ-13814 TDQ-13930 always ask user to change the Property to built-in mode (#1424) 2017-06-21 16:22:08 +08:00
kevin.cui
39ea1fe8be TMDM-11077 : tMDMBulkLoad & tMDMConnection can't load data with auto commit setting (#1429) 2017-06-21 03:17:08 -05:00
zwxue
3cce521491 fix(TUP-17726):java version for reference project changed to 1.8 after
migration.
2017-06-19 16:09:02 +08:00
zwxue
8cc6cbbd02 fix(TUP-18075):Studio throw NPE error when switch to page "Deployment"
for a service child node.
2017-06-19 16:08:20 +08:00
Jenkins Continuous Build server
dec1792509 Set version to 6.4.1 2017-06-14 12:42:04 +02:00
137 changed files with 228 additions and 180 deletions

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.componentdesigner.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.componentdesigner.rcp.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.abstractmap.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.alfrescooutput.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.business.diagram.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.codegen.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.components.exchange.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.core.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.dbmap.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.documentation.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.fileoutputxml.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.gefabstractmap.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.hl7.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.mapper.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.maven.job.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.rowgenerator.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.runprocess.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.scd.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.webservice.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.xmlmap.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.expressionbuilder.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.ftp.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.json.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.view.di.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.sbi.engines.client.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.spagic.engines.client.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.sqlbuilder.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.componentdesigner.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.business.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.branding.tos.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.sbi.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.spagic.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.tos.components.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.tos.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.tos.libraries.feature</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.componentdesigner.rcp</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.componentdesigner</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.abstractmap</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.alfrescooutput</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.business.diagram</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.codegen</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.components.exchange</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.components.libs</artifactId>

View File

@@ -366,6 +366,12 @@
}
com.google.api.services.bigquery.model.Job doneJob_<%=cid%> = pollJob_<%=cid%>;
if ((doneJob_<%=cid%>.getStatus() != null) && (doneJob_<%=cid%>.getStatus().getErrors() != null)) {
status = "failure";
throw new Exception(doneJob_<%=cid%>.getStatus().getErrors().toString());
}
System.out.println("Done: " + doneJob_<%=cid%>.toString());
com.google.api.services.bigquery.model.JobStatistics jobStatistics_<%=cid%>= doneJob_<%=cid%>.getStatistics();
if(jobStatistics_<%=cid%>!=null && jobStatistics_<%=cid%>.getLoad() != null){

View File

@@ -36,33 +36,35 @@ String trans = "mdmTrans_" + connection;
org.talend.mdm.bulkload.client.BulkloadClient bulkloadClient_<%=cid %> = new org.talend.mdm.bulkload.client.BulkloadClient(<%=mdmUrl %>, <%=username %>, decryptedPassword_<%=cid %>, null, <%=dataCluster %> + "<%=isStaging?"#STAGING":""%>", <%=dataEntity %>, <%=dataModule %>);
<%if(useTransaction) {%>
String transKey_<%=cid %> = "<%=trans%>_" + Thread.currentThread().getThreadGroup().getName();
com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
if(mdmTransaction_<%=cid %> == null) {
String murl_<%=cid %> = (String)globalMap.get("mdmUrl_<%=connection %>");
if(murl_<%=cid %>.endsWith("?wsdl")) {
murl_<%=cid %> = murl_<%=cid %>.substring(0, murl_<%=cid %>.length() - 5);
if(globalMap.get("useTransaction_<%=connection %>") != null && (Boolean)globalMap.get("useTransaction_<%=connection %>")) {
String transKey_<%=cid %> = "<%=trans%>_" + Thread.currentThread().getThreadGroup().getName();
com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
if(mdmTransaction_<%=cid %> == null) {
String murl_<%=cid %> = (String)globalMap.get("mdmUrl_<%=connection %>");
if(murl_<%=cid %>.endsWith("?wsdl")) {
murl_<%=cid %> = murl_<%=cid %>.substring(0, murl_<%=cid %>.length() - 5);
}
String turl_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getMDMTransactionURL(murl_<%=cid %>, true);
String username_<%=cid %> = (String)globalMap.get("username_<%=connection %>");
String password_<%=cid %> = (String)globalMap.get("password_<%=connection %>");
if((Boolean)globalMap.get("useClientTranId_<%=connection %>")) {
String sessionID_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
mdmTransaction_<%=cid %>.setId("<%=cid %>_" + java.util.UUID.randomUUID());
mdmTransaction_<%=cid %>.setUsername(username_<%=cid %>);
mdmTransaction_<%=cid %>.setPassword(password_<%=cid %>);
mdmTransaction_<%=cid %>.setSessionId(sessionID_<%=cid %>);
} else {
<% logUtil.debug("\"Attempt to get a remote transaction from url: \" + murl_" + cid);%>
mdmTransaction_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.newTransaction(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
}
globalMap.put(transKey_<%=cid %>, mdmTransaction_<%=cid %>);
<% logUtil.debug("\"Got transaction successfully with key=\" + transKey_" + cid);%>
}
String turl_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getMDMTransactionURL(murl_<%=cid %>, true);
String username_<%=cid %> = (String)globalMap.get("username_<%=connection %>");
String password_<%=cid %> = (String)globalMap.get("password_<%=connection %>");
if((Boolean)globalMap.get("useClientTranId_<%=connection %>")) {
String sessionID_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
mdmTransaction_<%=cid %>.setId("<%=cid %>_" + java.util.UUID.randomUUID());
mdmTransaction_<%=cid %>.setUsername(username_<%=cid %>);
mdmTransaction_<%=cid %>.setPassword(password_<%=cid %>);
mdmTransaction_<%=cid %>.setSessionId(sessionID_<%=cid %>);
} else {
<% logUtil.debug("\"Attempt to get a remote transaction from url: \" + murl_" + cid);%>
mdmTransaction_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.newTransaction(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
}
globalMap.put(transKey_<%=cid %>, mdmTransaction_<%=cid %>);
<% logUtil.debug("\"Got transaction successfully with key=\" + transKey_" + cid);%>
bulkloadClient_<%=cid %>.setTransactionId(mdmTransaction_<%=cid %>.getId());
bulkloadClient_<%=cid %>.setSessionId(mdmTransaction_<%=cid%>.getSessionId());
}
bulkloadClient_<%=cid %>.setTransactionId(mdmTransaction_<%=cid %>.getId());
bulkloadClient_<%=cid %>.setSessionId(mdmTransaction_<%=cid%>.getSessionId());
<%}%>
bulkloadClient_<%=cid %>.startThreadCount();

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.components.localprovider</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.core.generic</artifactId>

View File

@@ -49,6 +49,7 @@ import org.talend.core.model.process.EComponentCategory;
import org.talend.core.model.process.EConnectionType;
import org.talend.core.model.process.EParameterFieldType;
import org.talend.core.model.process.IElement;
import org.talend.core.model.process.IElementParameter;
import org.talend.core.model.process.IElementParameterDefaultValue;
import org.talend.core.model.process.INode;
import org.talend.core.model.process.INodeConnector;
@@ -331,7 +332,7 @@ public class ComponentsUtils {
} else if (widgetProperty instanceof Property) {
Property property = (Property) widgetProperty;
param.setRequired(property.isRequired());
param.setValue(getParameterValue(element, property, fieldType));
param.setValue(getParameterValue(element, property, fieldType, parameterName));
boolean isNameProperty = IGenericConstants.NAME_PROPERTY.equals(param.getParameterName());
if (EParameterFieldType.NAME_SELECTION_AREA.equals(fieldType) || EParameterFieldType.JSON_TABLE.equals(fieldType)
|| EParameterFieldType.CLOSED_LIST.equals(fieldType) || EParameterFieldType.CHECK.equals(fieldType)
@@ -493,7 +494,7 @@ public class ComponentsUtils {
return params;
}
public static Object getParameterValue(IElement element, Property property, EParameterFieldType fieldType) {
public static Object getParameterValue(IElement element, Property property, EParameterFieldType fieldType, String parameterName) {
Object paramValue = property.getStoredValue();
if (paramValue instanceof List) {
return null;
@@ -507,10 +508,24 @@ public class ComponentsUtils {
}
}
} else if (GenericTypeUtils.isStringType(property)) {
boolean needInitializeProperty = false;
IElementParameter oldParam = null;
if (element.getElementParameters() != null) {
oldParam = element.getElementParameter(parameterName);
}
if (oldParam == null || oldParam.getValue() == null || !StringUtils.equals((String) oldParam.getValue(), (String) property.getStoredValue())) {
// if parameter is not setup yet (= initialization)
// then we set the value and check if we need to add quotes.
//
// if parameter value / property value are not the same
// then the component updated the property in it's own code, so we need to add quotes/initialize.
needInitializeProperty = true;
}
String value = (String) paramValue;
// If value is not context mode and is not in wizard and is not changed by user then add double quotes.
if (!(element instanceof FakeElement || ContextParameterUtils.isContainContextParam(value)
|| isPropertyChangedByUser(property))) {
// If property is not initialized by client and value is not context mode and is not in wizard then add
// double quotes.
if (needInitializeProperty && !(element instanceof FakeElement || ContextParameterUtils.isContainContextParam(value))) {
if (value == null) {
value = StringUtils.EMPTY;
}

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.core</artifactId>

View File

@@ -3345,7 +3345,8 @@ public class Node extends Element implements IGraphicalNode {
// check not startable components not linked
if (getComponentProperties() == null) {
if ((getConnectorFromType(EConnectionType.FLOW_MAIN).getMaxLinkInput() == 0)
if (getConnectorFromType(EConnectionType.FLOW_MAIN) != null
&& (getConnectorFromType(EConnectionType.FLOW_MAIN).getMaxLinkInput() == 0)
&& (getConnectorFromType(EConnectionType.FLOW_MAIN).getMaxLinkOutput() != 0)) {
if ((getCurrentActiveLinksNbOutput(EConnectionType.FLOW_MAIN) == 0)
&& (getCurrentActiveLinksNbOutput(EConnectionType.FLOW_MERGE) == 0)

View File

@@ -2546,7 +2546,8 @@ public class Process extends Element implements IProcess2, IGEFProcess, ILastVer
if (!listNames.contains(metadataTable.getTableName())) {
listNames.add(metadataTable.getTableName());
listMetaData.add(metadataTable);
if (nc.getConnectorFromType(EConnectionType.FLOW_MAIN).isMultiSchema()
if (nc.getConnectorFromType(EConnectionType.FLOW_MAIN) != null
&& nc.getConnectorFromType(EConnectionType.FLOW_MAIN).isMultiSchema()
&& checkValidConnectionName(metadataTable.getTableName())) {
addUniqueConnectionName(metadataTable.getTableName());
// for tmap 11884

View File

@@ -1684,6 +1684,7 @@ public class ProcessUpdateManager extends AbstractUpdateManager {
}
List<UpdateResult> propertiesResults = new ArrayList<UpdateResult>();
for (IElementParameter curPropertyParam : node.getElementParametersFromField(EParameterFieldType.PROPERTY_TYPE)) {
String propertyType = (String) curPropertyParam.getChildParameters().get(EParameterName.PROPERTY_TYPE.getName())
.getValue();
@@ -2197,6 +2198,8 @@ public class ProcessUpdateManager extends AbstractUpdateManager {
result.setResult(EUpdateItemType.NODE_PROPERTY, EUpdateResult.UPDATE, newValueParameter);
}
}
} else if (item != null && item instanceof RulesItem) {
// if the RulesItem is not null, that means the Rule exist, so do nothing
} else {
result = new UpdateCheckResult(node);
result.setResult(EUpdateItemType.NODE_PROPERTY, EUpdateResult.BUIL_IN, repositoryPropertyParam);

View File

@@ -130,7 +130,7 @@ public class DeploymentComposite extends AbstractTabComposite {
}
} else {
IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
if (esbService.isWSDLEditor(editor) && esbService.getServicesType() == repositoryViewObject.getRepositoryObjectType()) {
if (esbService != null && esbService.isWSDLEditor(editor)) {
serviceItem = esbService.getWSDLEditorItem(editor);
commandStack = (CommandStack) editor.getAdapter(CommandStack.class);
defaultVersion = getDefaultVersion(serviceItem.getProperty().getVersion());

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.dbmap</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.documentation</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.filemultischemas</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.fileoutputxml</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.gefabstractmap</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.hl7</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.mapper.advanced</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.mapper</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.maven.job</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.publish.core</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.rowgenerator</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.runprocess</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.runtime.visualization.tools</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.runtime.visualization</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.scd</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.spss</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.tutorials</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.webservice</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.xmlmap</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.expressionbuilder</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.asm</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.bonita</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.crm</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.css</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.custom</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.edifact</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.ehcache</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.excel</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.ftp</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.groovy</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.guava</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.hadoop.mapr.5.0.0</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.hl7.jars</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.hl7</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jax</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jersey</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jetty</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.json</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.microsoft</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.mondrian</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId>
<version>6.4.1-SNAPSHOT</version>
<version>6.4.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.mozilla</artifactId>

Some files were not shown because too many files have changed in this diff Show More