From af31dae9dd31b495c6e73339976a89ec419924ed Mon Sep 17 00:00:00 2001 From: zshen-talend Date: Thu, 18 Dec 2014 12:22:22 +0800 Subject: [PATCH 1/5] bug fixed TDQ-9487 change input columns' name, transfer changes to tMatchGroup, but when open the "Configuration wizard" still use the old name tMatchGroup need to propagate change too --- .../core/ui/editor/cmd/ExternalNodeChangeCommand.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/cmd/ExternalNodeChangeCommand.java b/main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/cmd/ExternalNodeChangeCommand.java index 1277cfa714b..49ed101d4aa 100644 --- a/main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/cmd/ExternalNodeChangeCommand.java +++ b/main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/cmd/ExternalNodeChangeCommand.java @@ -39,6 +39,7 @@ import org.talend.core.model.process.IExternalData; import org.talend.core.model.process.IExternalNode; import org.talend.core.model.process.INode; import org.talend.core.model.process.INodeConnector; +import org.talend.core.service.IDQComponentService; import org.talend.core.service.IXmlMapService; import org.talend.designer.core.i18n.Messages; import org.talend.designer.core.model.components.EParameterName; @@ -389,6 +390,10 @@ public class ExternalNodeChangeCommand extends Command { IODataComponent output = new IODataComponent(connection, dataComponent.getTable()); target.metadataInputChanged(output, connection.getUniqueName()); } + } else if (GlobalServiceRegister.getDefault().isServiceRegistered(IDQComponentService.class)) { + final IDQComponentService service = (IDQComponentService) GlobalServiceRegister.getDefault() + .getService(IDQComponentService.class); + service.externalComponentChange(connection, dataComponent.getTable()); } } } From 5d67622ecb83248c0f105cadd0a2e0b5da3f6359 Mon Sep 17 00:00:00 2001 From: zshen-talend Date: Thu, 18 Dec 2014 18:46:14 +0800 Subject: [PATCH 2/5] bug fixed DQ-9487 change input columns' name, transfer changes to tMatchGroup, but when open the "Configuration wizard" still use the old name. fixed one login error --- .../designer/core/ui/editor/cmd/ExternalNodeChangeCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/cmd/ExternalNodeChangeCommand.java b/main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/cmd/ExternalNodeChangeCommand.java index 49ed101d4aa..255b04b3bfb 100644 --- a/main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/cmd/ExternalNodeChangeCommand.java +++ b/main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/cmd/ExternalNodeChangeCommand.java @@ -390,7 +390,8 @@ public class ExternalNodeChangeCommand extends Command { IODataComponent output = new IODataComponent(connection, dataComponent.getTable()); target.metadataInputChanged(output, connection.getUniqueName()); } - } else if (GlobalServiceRegister.getDefault().isServiceRegistered(IDQComponentService.class)) { + } + if (GlobalServiceRegister.getDefault().isServiceRegistered(IDQComponentService.class)) { final IDQComponentService service = (IDQComponentService) GlobalServiceRegister.getDefault() .getService(IDQComponentService.class); service.externalComponentChange(connection, dataComponent.getTable()); From dd904b42d435817f52e636f7907cb4c6424ac4a5 Mon Sep 17 00:00:00 2001 From: jzhao Date: Tue, 9 Dec 2014 15:32:29 +0800 Subject: [PATCH 3/5] TDI-31118: "specify identity field" don't work for tmssqloutput when talend column name is different with talend db name https://jira.talendforge.org/browse/TDI-31118 Note: 1.Fixed when column label and db column name is different, create table error problem 2.Fixed when create table with identity column would have insert problem --- .../tMSSqlOutput/tMSSqlOutput_begin.javajet | 19 +++++++- .../tMSSqlOutput/tMSSqlOutput_end.javajet | 28 +++++++++--- .../tMSSqlOutput/tMSSqlOutput_java.xml | 8 ++-- .../tMSSqlOutput/tMSSqlOutput_main.javajet | 43 ++++++++++++++++--- .../templates/db_output_bulk.skeleton | 12 +++++- 5 files changed, 90 insertions(+), 20 deletions(-) diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_begin.javajet b/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_begin.javajet index e00d222fad6..6fc2c6f857c 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_begin.javajet +++ b/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_begin.javajet @@ -63,12 +63,18 @@ skeleton="../templates/db_output_bulk.skeleton" String commitEvery = ElementParameterParser.getValue(node, "__COMMIT_EVERY__"); - String identityInsert = ElementParameterParser.getValue(node, "__IDENTITY_INSERT__"); + boolean identityInsert= "true".equals(ElementParameterParser.getValue(node, "__IDENTITY_INSERT__")); boolean isEnableDebug = ("true").equals(ElementParameterParser.getValue(node,"__ENABLE_DEBUG_MODE__")); boolean usingStatsLogs=cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("talendMeter_DB"); String useBatchSize = ElementParameterParser.getValue(node,"__USE_BATCH_SIZE__"); String batchSize=ElementParameterParser.getValue(node,"__BATCH_SIZE__"); + boolean isUseParallelize ="true".equalsIgnoreCase(ElementParameterParser.getValue(node, "__PARALLELIZE__")); + boolean isSpecifyIdentityKey = "true".equals(ElementParameterParser.getValue(node, "__SPECIFY_IDENTITY_FIELD__")); + if(isUseParallelize || identityInsert || (!"DROP_CREATE".equals(tableAction) && !"CREATE".equals(tableAction) && !"DROP_IF_EXISTS_AND_CREATE".equals(tableAction))){ + isSpecifyIdentityKey = false; + } + String identityKey = ElementParameterParser.getValue(node, "__IDENTITY_FIELD__"); %> int nb_line_<%=cid%> = 0; int nb_line_update_<%=cid%> = 0; @@ -266,6 +272,9 @@ if(usingStatsLogs){ %> <% for(Column column : stmtStructure) { if(!column.isReplaced() && !column.isAddCol() && column.isInsertable()) { + if(isSpecifyIdentityKey && (column.getName().equals(identityKey))&& !column.isDynamic()) { + continue; + } String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getColumn().getTalendType(), column.getColumn().isNullable()); %> <%=typeToGenerate%> <%=column.getName()%>; @@ -279,6 +288,9 @@ if(usingStatsLogs){ %> int count = 0; for(Column column : stmtStructure) { if(!column.isReplaced() && !column.isAddCol() && column.isInsertable()) { + if(isSpecifyIdentityKey && (column.getName().equals(identityKey))&& !column.isDynamic()) { + continue; + } if(count != 0) { %> , @@ -296,6 +308,9 @@ if(usingStatsLogs){ %> <% for(Column column : stmtStructure) { if(!column.isReplaced() && !column.isAddCol() && column.isInsertable()) { + if(isSpecifyIdentityKey && (column.getName().equals(identityKey))&& !column.isDynamic()) { + continue; + } %> this.<%=column.getName()%> = <%=column.getName()%>; <% @@ -336,7 +351,7 @@ if(usingStatsLogs){ %> boolean isShareIdentity_<%=cid%> = globalMap.get("shareIdentitySetting_<%=connection%>") != null && (Boolean)globalMap.get("shareIdentitySetting_<%=connection%>") == true; <% } - if(("true").equals(identityInsert) ) { + if(identityInsert ) { %> java.sql.Statement stmt_<%=cid %> = conn_<%=cid%>.createStatement(); <% diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_end.javajet b/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_end.javajet index 8abe22d1776..4153f1c63fa 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_end.javajet +++ b/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_end.javajet @@ -34,7 +34,7 @@ skeleton="../templates/db_output_bulk.skeleton" String useExistingConn = ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"); - String identityInsert = ElementParameterParser.getValue(node, "__IDENTITY_INSERT__"); + boolean identityInsert= "true".equals(ElementParameterParser.getValue(node, "__IDENTITY_INSERT__")); boolean useExistingConnection = "true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__")); @@ -71,7 +71,14 @@ skeleton="../templates/db_output_bulk.skeleton" IConnection rejectConn = rejectConns.get(0); rejectConnName = rejectConn.getName(); } - if(("true").equals(identityInsert) && useExistingConnection ) { + String tableAction = ElementParameterParser.getValue(node,"__TABLE_ACTION__"); + boolean isUseParallelize ="true".equalsIgnoreCase(ElementParameterParser.getValue(node, "__PARALLELIZE__")); + boolean isSpecifyIdentityKey = "true".equals(ElementParameterParser.getValue(node, "__SPECIFY_IDENTITY_FIELD__")); + if(isUseParallelize || identityInsert || (!"DROP_CREATE".equals(tableAction) && !"CREATE".equals(tableAction) && !"DROP_IF_EXISTS_AND_CREATE".equals(tableAction))){ + isSpecifyIdentityKey = false; + } + String identityKey = ElementParameterParser.getValue(node, "__IDENTITY_FIELD__"); + if(identityInsert && useExistingConnection ) { %> if ( isShareIdentity_<%=cid%> ) { String setIdentityInsertONSQL_<%=cid%> = "SET IDENTITY_INSERT ["+ tableName_<%=cid%> +"] ON"; @@ -316,12 +323,21 @@ skeleton="../templates/db_output_bulk.skeleton" for(BufferLine_<%=cid%> bufferL<%=cid%> : sInsertColValueList<%=cid%>){ <% if(!isDynamic) { - %> - count<%=cid%> = row2Count<%=cid%>*<%=columnList.size()%>+1; - <% + if(isSpecifyIdentityKey) { + %> + count<%=cid%> = row2Count<%=cid%>*<%=columnList.size()-1%>+1; + <% + }else{ + %> + count<%=cid%> = row2Count<%=cid%>*<%=columnList.size()%>+1; + <% + } } for(Column column : stmtStructure) { if(!column.isReplaced() && !column.isAddCol() && column.isInsertable() && !column.isDynamic()) { + if(isSpecifyIdentityKey && (column.getName().equals(identityKey))) { + continue; + } String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getColumn().getTalendType(), column.getColumn().isNullable()); siOperation.generateSetStmt(typeToGenerate, column, cid,incomingConnName,ignoreDateOutofRange,dbmsId); %> @@ -423,7 +439,7 @@ skeleton="../templates/db_output_bulk.skeleton" <% } -if(("true").equals(identityInsert)){ +if(identityInsert){ %> String setIdentityInsertOFFSQL_<%=cid%> = "SET IDENTITY_INSERT ["+ tableName_<%=cid%> +"] OFF"; <%dbLog.data().sqlExecuteTry(dbLog.var("setIdentityInsertOFFSQL"));%> diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_java.xml index 0d3ad74d184..f3210407f30 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_java.xml @@ -138,19 +138,19 @@ NOTE: batch size must be less than or equal to total number of parameter markers divided by number of columns - + false - + - + 1 - + 1 diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_main.javajet b/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_main.javajet index c8a96c4e6bd..7b950074aa8 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_main.javajet +++ b/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_main.javajet @@ -52,7 +52,7 @@ skeleton="../templates/db_output_bulk.skeleton" String batchSize =ElementParameterParser.getValue(node, "__BATCH_SIZE__"); - String identityInsert = ElementParameterParser.getValue(node, "__IDENTITY_INSERT__"); + boolean identityInsert= "true".equals(ElementParameterParser.getValue(node, "__IDENTITY_INSERT__")); String incomingConnName = null; @@ -113,6 +113,12 @@ skeleton="../templates/db_output_bulk.skeleton" } } + boolean isUseParallelize ="true".equalsIgnoreCase(ElementParameterParser.getValue(node, "__PARALLELIZE__")); + boolean isSpecifyIdentityKey = "true".equals(ElementParameterParser.getValue(node, "__SPECIFY_IDENTITY_FIELD__")); + if(isUseParallelize || identityInsert || (!"DROP_CREATE".equals(tableAction) && !"CREATE".equals(tableAction) && !"DROP_IF_EXISTS_AND_CREATE".equals(tableAction))){ + isSpecifyIdentityKey = false; + } + String identityKey = ElementParameterParser.getValue(node, "__IDENTITY_FIELD__"); class SingleInsertQueryOperation{ public String generateType(String typeToGenerate){ @@ -478,7 +484,7 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t } if(incomingConnName != null && columnList != null){ - if(("true").equals(identityInsert) && useExistingConnection ) { + if(identityInsert && useExistingConnection ) { %> if ( isShareIdentity_<%=cid%> ) { stmt_<%=cid %>.execute("SET IDENTITY_INSERT ["+ tableName_<%=cid%> +"] ON"); @@ -501,6 +507,9 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t for(Column column : colStruct) { if(column.isInsertable()) { String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getColumn().getTalendType(), column.getColumn().isNullable()); + if(isSpecifyIdentityKey && (column.getName().equals(identityKey)) && column.isInsertable() && !column.isDynamic()) { + continue; + } %> <%=getManager(dbmsId, cid).generateSetStmt(typeToGenerate,String.valueOf(ignoreDateOutofRange), column, counter, incomingConnName, cid, NORMAL_TYPE,null)%> <% @@ -603,13 +612,23 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t } } if(!isDynamic) { - %> + if(isSpecifyIdentityKey){ + %> + int counter<%=cid%> = rowCount<%=cid%> * <%=insertableCount-1%> + 1; + + <% + }else{ + %> int counter<%=cid%> = rowCount<%=cid%> * <%=insertableCount%> + 1; - <% + <% + } } for(Column column : colStruct) { if(column.isInsertable()) { + if(isSpecifyIdentityKey && (column.getName().equals(identityKey)) && !column.isDynamic()) { + continue; + } String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getColumn().getTalendType(), column.getColumn().isNullable()); siOperation.generateSetStmt(typeToGenerate,column,incomingConnName,cid,ignoreDateOutofRange,dbmsId); %> @@ -618,7 +637,7 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t } } if(isDynamic) { - Column dynamicColumn = getColumn(talendDynCol); + Column dynamicColumn = getColumn(talendDynCol); String typeToGenerate = JavaTypesManager.getTypeToGenerate(dynamicColumn.getColumn().getTalendType(), dynamicColumn.getColumn().isNullable()); if("Dynamic".equals(typeToGenerate)) { %> @@ -634,6 +653,9 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t int count =0; for(Column column : colStruct) { if(column.isInsertable()) { + if(isSpecifyIdentityKey && (column.getName().equals(identityKey)) && !column.isDynamic()) { + continue; + } if(count != 0) { %> , @@ -1011,6 +1033,9 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t for(Column columnInsert : colStruct) { if(columnInsert.isInsertable()) { String typeToGenerate = JavaTypesManager.getTypeToGenerate(columnInsert.getColumn().getTalendType(), columnInsert.getColumn().isNullable()); + if(isSpecifyIdentityKey && (columnInsert.getName().equals(identityKey)) && columnInsert.isInsertable() && !columnInsert.isDynamic()) { + continue; + } %> <%=getManager(dbmsId, cid).generateSetStmt(typeToGenerate, String.valueOf(ignoreDateOutofRange), columnInsert, counterInsert, incomingConnName, cid, INSERT_TYPE,null)%> <% @@ -1208,6 +1233,9 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t for(Column column : colStruct) { if(column.isInsertable()) { String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getColumn().getTalendType(), column.getColumn().isNullable()); + if(isSpecifyIdentityKey && (column.getName().equals(identityKey)) && column.isInsertable() && !column.isDynamic()) { + continue; + } %> <%=getManager(dbmsId, cid).generateSetStmt(typeToGenerate, String.valueOf(ignoreDateOutofRange), column, counter, incomingConnName, cid, INSERT_TYPE,null)%> <% @@ -1432,6 +1460,9 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t for(Column columnInsert : colStruct) { if(columnInsert.isInsertable()) { String typeToGenerate = JavaTypesManager.getTypeToGenerate(columnInsert.getColumn().getTalendType(), columnInsert.getColumn().isNullable()); + if(isSpecifyIdentityKey && (columnInsert.getName().equals(identityKey)) && columnInsert.isInsertable() && !columnInsert.isDynamic()) { + continue; + } %> <%=getManager(dbmsId, cid).generateSetStmt(typeToGenerate, String.valueOf(ignoreDateOutofRange), columnInsert, counterInsert, incomingConnName, cid, INSERT_TYPE,null)%> <% @@ -1674,7 +1705,7 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t } } - if(("true").equals(identityInsert) && useExistingConnection ) { + if(identityInsert && useExistingConnection ) { %> if (isShareIdentity_<%=cid%> ) { stmt_<%=cid %>.execute("SET IDENTITY_INSERT ["+ tableName_<%=cid%> +"] OFF"); diff --git a/main/plugins/org.talend.designer.components.localprovider/components/templates/db_output_bulk.skeleton b/main/plugins/org.talend.designer.components.localprovider/components/templates/db_output_bulk.skeleton index 27ef4dcda2d..30d67abb2ea 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/templates/db_output_bulk.skeleton +++ b/main/plugins/org.talend.designer.components.localprovider/components/templates/db_output_bulk.skeleton @@ -538,7 +538,7 @@ public class CLASS { List stmtStructure = createColumnList(columnList, useFieldOptions, fieldOptions, addCols); if(isSpecifyIdentityKey) { for(Column column : stmtStructure) { - if(column.getColumnName().equals(identityKey)) { + if(column.name.equals(identityKey)) { column.setAutoIncrement(true); column.setStartValue(startValue); column.setStep(step); @@ -690,7 +690,15 @@ public class CLASS { } String suffix = null; String separate = null; - if(column.isInsertable() && !column.isDynamic()) { + boolean isParallelize = "true".equals(ElementParameterParser.getValue(node, "__PARALLELIZE__")); + boolean identityInsert= "true".equals(ElementParameterParser.getValue(node, "__IDENTITY_INSERT__")); + String tableAction = ElementParameterParser.getValue(node, "__TABLE_ACTION__"); + boolean isSpecifyIdentityKey = "true".equals(ElementParameterParser.getValue(node, "__SPECIFY_IDENTITY_FIELD__")); + if(isParallelize || identityInsert || (!"DROP_CREATE".equals(tableAction) && !"CREATE".equals(tableAction) && !"DROP_IF_EXISTS_AND_CREATE".equals(tableAction))){ + isSpecifyIdentityKey = false; + } + String identityKey = ElementParameterParser.getValue(node, "__IDENTITY_FIELD__"); + if(!(isSpecifyIdentityKey && (column.getName().equals(identityKey))) && column.isInsertable() && !column.isDynamic()) { if(firstInsertColumn.toString().equals("true")) { suffix = ""; firstInsertColumn = new StringBuilder("false"); From 7c9bb816dc0fa0a15d22261aae5c4efd226c7299 Mon Sep 17 00:00:00 2001 From: jzhao Date: Thu, 5 Dec 2013 17:50:36 +0800 Subject: [PATCH 4/5] TDI-30358: tGSConnection and tS3Connection returns NoSuchMethodError https://jira.talendforge.org/browse/TDI-30358 --- .../components/tGSBucketCreate/tGSBucketCreate_java.xml | 4 ++-- .../components/tGSBucketDelete/tGSBucketDelete_java.xml | 4 ++-- .../components/tGSBucketExist/tGSBucketExist_java.xml | 4 ++-- .../components/tGSBucketList/tGSBucketList_java.xml | 4 ++-- .../components/tGSConnection/tGSConnection_java.xml | 4 ++-- .../components/tGSCopy/tGSCopy_java.xml | 4 ++-- .../components/tGSDelete/tGSDelete_java.xml | 4 ++-- .../components/tGSGet/tGSGet_java.xml | 4 ++-- .../components/tGSList/tGSList_java.xml | 4 ++-- .../components/tGSPut/tGSPut_java.xml | 4 ++-- .../components/tMicrosoftCrmInput/tMicrosoftCrmInput_java.xml | 2 +- .../tMicrosoftCrmOutput/tMicrosoftCrmOutput_java.xml | 2 +- .../components/tPaloCheckElements/tPaloCheckElements_java.xml | 4 ++-- .../components/tPaloConnection/tPaloConnection_java.xml | 4 ++-- .../components/tPaloCube/tPaloCube_java.xml | 4 ++-- .../components/tPaloCubeList/tPaloCubeList_java.xml | 4 ++-- .../components/tPaloDatabase/tPaloDatabase_java.xml | 4 ++-- .../components/tPaloDatabaseList/tPaloDatabaseList_java.xml | 4 ++-- .../components/tPaloDimension/tPaloDimension_java.xml | 4 ++-- .../components/tPaloDimensionList/tPaloDimensionList_java.xml | 4 ++-- .../components/tPaloInputMulti/tPaloInputMulti_java.xml | 4 ++-- .../components/tPaloOutputMulti/tPaloOutputMulti_java.xml | 4 ++-- .../components/tPaloRule/tPaloRule_java.xml | 4 ++-- .../components/tPaloRuleList/tPaloRuleList_java.xml | 4 ++-- .../tSalesforceConnection/tSalesforceConnection_java.xml | 2 +- .../tSalesforceGetDeleted/tSalesforceGetDeleted_java.xml | 2 +- .../tSalesforceGetServerTimestamp_java.xml | 2 +- .../tSalesforceGetUpdated/tSalesforceGetUpdated_java.xml | 2 +- .../components/tSalesforceInput/tSalesforceInput_java.xml | 2 +- .../components/tSalesforceOutput/tSalesforceOutput_java.xml | 2 +- .../components/tVtigerCRMInput/tVtigerCRMInput_java.xml | 4 ++-- .../components/tVtigerCRMOutput/tVtigerCRMOutput_java.xml | 4 ++-- 32 files changed, 56 insertions(+), 56 deletions(-) diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tGSBucketCreate/tGSBucketCreate_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tGSBucketCreate/tGSBucketCreate_java.xml index 4129ca50cec..e8e2476e75f 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tGSBucketCreate/tGSBucketCreate_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tGSBucketCreate/tGSBucketCreate_java.xml @@ -152,8 +152,8 @@ - - + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tGSBucketDelete/tGSBucketDelete_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tGSBucketDelete/tGSBucketDelete_java.xml index 1d696a23cf8..35b3d393e6f 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tGSBucketDelete/tGSBucketDelete_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tGSBucketDelete/tGSBucketDelete_java.xml @@ -99,8 +99,8 @@ - - + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tGSBucketExist/tGSBucketExist_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tGSBucketExist/tGSBucketExist_java.xml index cd913edc1c8..12ce3740042 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tGSBucketExist/tGSBucketExist_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tGSBucketExist/tGSBucketExist_java.xml @@ -99,8 +99,8 @@ - - + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tGSBucketList/tGSBucketList_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tGSBucketList/tGSBucketList_java.xml index feb89f33c9f..6dace88fbda 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tGSBucketList/tGSBucketList_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tGSBucketList/tGSBucketList_java.xml @@ -102,8 +102,8 @@ - - + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tGSConnection/tGSConnection_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tGSConnection/tGSConnection_java.xml index 384204b8d77..e3ce2427a04 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tGSConnection/tGSConnection_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tGSConnection/tGSConnection_java.xml @@ -62,8 +62,8 @@ - - + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tGSCopy/tGSCopy_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tGSCopy/tGSCopy_java.xml index 47d6444074b..305c1de656d 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tGSCopy/tGSCopy_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tGSCopy/tGSCopy_java.xml @@ -169,8 +169,8 @@ - - + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tGSDelete/tGSDelete_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tGSDelete/tGSDelete_java.xml index 3a33a76dbff..1168cfd5f2d 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tGSDelete/tGSDelete_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tGSDelete/tGSDelete_java.xml @@ -161,8 +161,8 @@ - - + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tGSGet/tGSGet_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tGSGet/tGSGet_java.xml index 21e105e3583..54c12b75768 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tGSGet/tGSGet_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tGSGet/tGSGet_java.xml @@ -198,8 +198,8 @@ - - + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tGSList/tGSList_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tGSList/tGSList_java.xml index ec580297317..a1ee8cf9aee 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tGSList/tGSList_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tGSList/tGSList_java.xml @@ -161,8 +161,8 @@ - - + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tGSPut/tGSPut_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tGSPut/tGSPut_java.xml index 5abcc207a6e..ed8f0ecfb5a 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tGSPut/tGSPut_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tGSPut/tGSPut_java.xml @@ -142,8 +142,8 @@ - - + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_java.xml index 6af6f2e976d..7a566f51ad7 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_java.xml @@ -11396,7 +11396,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_java.xml index 6b8cc34beca..f6494e3193f 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_java.xml @@ -16385,7 +16385,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tPaloCheckElements/tPaloCheckElements_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tPaloCheckElements/tPaloCheckElements_java.xml index 44d90d4ca9a..34e47bbbf59 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tPaloCheckElements/tPaloCheckElements_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tPaloCheckElements/tPaloCheckElements_java.xml @@ -169,9 +169,9 @@ - + - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tPaloConnection/tPaloConnection_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tPaloConnection/tPaloConnection_java.xml index 0553536cbc6..446abde9b5f 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tPaloConnection/tPaloConnection_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tPaloConnection/tPaloConnection_java.xml @@ -88,9 +88,9 @@ - + - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tPaloCube/tPaloCube_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tPaloCube/tPaloCube_java.xml index 08e848e49ae..eb56e30566e 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tPaloCube/tPaloCube_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tPaloCube/tPaloCube_java.xml @@ -168,9 +168,9 @@ - + - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tPaloCubeList/tPaloCubeList_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tPaloCubeList/tPaloCubeList_java.xml index 0607416563c..31d2d7df1c8 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tPaloCubeList/tPaloCubeList_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tPaloCubeList/tPaloCubeList_java.xml @@ -135,9 +135,9 @@ - + - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tPaloDatabase/tPaloDatabase_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tPaloDatabase/tPaloDatabase_java.xml index cd024239a1f..6305ae62ff5 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tPaloDatabase/tPaloDatabase_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tPaloDatabase/tPaloDatabase_java.xml @@ -131,9 +131,9 @@ - + - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tPaloDatabaseList/tPaloDatabaseList_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tPaloDatabaseList/tPaloDatabaseList_java.xml index 41bd7851332..642bb06b2bd 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tPaloDatabaseList/tPaloDatabaseList_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tPaloDatabaseList/tPaloDatabaseList_java.xml @@ -123,9 +123,9 @@ - + - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tPaloDimension/tPaloDimension_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tPaloDimension/tPaloDimension_java.xml index e8867128502..daac3db4e8e 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tPaloDimension/tPaloDimension_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tPaloDimension/tPaloDimension_java.xml @@ -308,9 +308,9 @@ - + - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tPaloDimensionList/tPaloDimensionList_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tPaloDimensionList/tPaloDimensionList_java.xml index af007e108cd..56afc797785 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tPaloDimensionList/tPaloDimensionList_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tPaloDimensionList/tPaloDimensionList_java.xml @@ -157,9 +157,9 @@ - + - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tPaloInputMulti/tPaloInputMulti_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tPaloInputMulti/tPaloInputMulti_java.xml index a03095ffe31..051a9af0d36 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tPaloInputMulti/tPaloInputMulti_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tPaloInputMulti/tPaloInputMulti_java.xml @@ -169,9 +169,9 @@ - + - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tPaloOutputMulti/tPaloOutputMulti_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tPaloOutputMulti/tPaloOutputMulti_java.xml index 0f7ee5995bf..0a15f5c01d8 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tPaloOutputMulti/tPaloOutputMulti_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tPaloOutputMulti/tPaloOutputMulti_java.xml @@ -200,9 +200,9 @@ - + - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tPaloRule/tPaloRule_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tPaloRule/tPaloRule_java.xml index d96b082bd3d..7149e66fd11 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tPaloRule/tPaloRule_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tPaloRule/tPaloRule_java.xml @@ -150,9 +150,9 @@ - + - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tPaloRuleList/tPaloRuleList_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tPaloRuleList/tPaloRuleList_java.xml index 3c98a649e4e..c572ade91fd 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tPaloRuleList/tPaloRuleList_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tPaloRuleList/tPaloRuleList_java.xml @@ -143,9 +143,9 @@ - + - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceConnection/tSalesforceConnection_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceConnection/tSalesforceConnection_java.xml index 8e2090b3aaa..bdd43b2459a 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceConnection/tSalesforceConnection_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceConnection/tSalesforceConnection_java.xml @@ -258,7 +258,7 @@ MODULE="commons-httpclient-3.1.jar" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/commons-httpclient-3.1.jar" REQUIRED="true" /> - diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceGetDeleted/tSalesforceGetDeleted_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceGetDeleted/tSalesforceGetDeleted_java.xml index 6418c521602..f140c87114f 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceGetDeleted/tSalesforceGetDeleted_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceGetDeleted/tSalesforceGetDeleted_java.xml @@ -2525,7 +2525,7 @@ MODULE="commons-httpclient-3.1.jar" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/commons-httpclient-3.1.jar" REQUIRED="true" /> - diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceGetServerTimestamp/tSalesforceGetServerTimestamp_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceGetServerTimestamp/tSalesforceGetServerTimestamp_java.xml index 4ed87378d8e..f0e7bfb9445 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceGetServerTimestamp/tSalesforceGetServerTimestamp_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceGetServerTimestamp/tSalesforceGetServerTimestamp_java.xml @@ -261,7 +261,7 @@ MODULE="commons-httpclient-3.1.jar" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/commons-httpclient-3.1.jar" REQUIRED="true" /> - diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceGetUpdated/tSalesforceGetUpdated_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceGetUpdated/tSalesforceGetUpdated_java.xml index 4bdd32a5e81..74c9b2ae409 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceGetUpdated/tSalesforceGetUpdated_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceGetUpdated/tSalesforceGetUpdated_java.xml @@ -2521,7 +2521,7 @@ MODULE="commons-httpclient-3.1.jar" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/commons-httpclient-3.1.jar" REQUIRED="true" /> - diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceInput/tSalesforceInput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceInput/tSalesforceInput_java.xml index af5df8c1772..26c9ac8a02f 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceInput/tSalesforceInput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceInput/tSalesforceInput_java.xml @@ -2643,7 +2643,7 @@ MODULE="commons-httpclient-3.1.jar" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/commons-httpclient-3.1.jar" REQUIRED_IF="API=='soap'" /> - diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceOutput/tSalesforceOutput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceOutput/tSalesforceOutput_java.xml index 96d9e638199..f32b5b2f89d 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceOutput/tSalesforceOutput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tSalesforceOutput/tSalesforceOutput_java.xml @@ -3487,7 +3487,7 @@ MODULE="commons-httpclient-3.1.jar" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/commons-httpclient-3.1.jar" REQUIRED="true" /> - diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tVtigerCRMInput/tVtigerCRMInput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tVtigerCRMInput/tVtigerCRMInput_java.xml index d5b25be6308..32248275f39 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tVtigerCRMInput/tVtigerCRMInput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tVtigerCRMInput/tVtigerCRMInput_java.xml @@ -798,8 +798,8 @@ - - + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tVtigerCRMOutput/tVtigerCRMOutput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tVtigerCRMOutput/tVtigerCRMOutput_java.xml index 11d2ac3f579..4ff075bfc14 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tVtigerCRMOutput/tVtigerCRMOutput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tVtigerCRMOutput/tVtigerCRMOutput_java.xml @@ -1339,8 +1339,8 @@ - - + + From e755e80368bbed8a076e1affe77f52744a1d6eac Mon Sep 17 00:00:00 2001 From: amarkevich Date: Fri, 19 Dec 2014 12:00:25 +0300 Subject: [PATCH 5/5] [tGoogleDrive] remove javax.annotation & commons-logging from bunlde --- .../tGoogleDriveConnection/tGoogleDriveConnection_java.xml | 4 ++-- .../components/tGoogleDriveCopy/tGoogleDriveCopy_java.xml | 4 ++-- .../components/tGoogleDriveCreate/tGoogleDriveCreate_java.xml | 4 ++-- .../components/tGoogleDriveDelete/tGoogleDriveDelete_java.xml | 4 ++-- .../components/tGoogleDriveGet/tGoogleDriveGet_java.xml | 4 ++-- .../components/tGoogleDriveList/tGoogleDriveList_java.xml | 4 ++-- .../components/tGoogleDrivePut/tGoogleDrivePut_java.xml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tGoogleDriveConnection/tGoogleDriveConnection_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tGoogleDriveConnection/tGoogleDriveConnection_java.xml index 4f995932a05..fbe06968a05 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tGoogleDriveConnection/tGoogleDriveConnection_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tGoogleDriveConnection/tGoogleDriveConnection_java.xml @@ -100,7 +100,7 @@ REQUIRED="true" /> + REQUIRED="true" BundleID="" /> + REQUIRED="true" BundleID="" /> + REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" /> + REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" /> + REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" /> + REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" /> + REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" /> + REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" /> + REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" /> + REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" /> + REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" /> + REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" /> + REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" /> + REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />