diff --git a/main/plugins/org.talend.designer.components.libs/libs_src/AddressDoctorClient/build.xml b/main/plugins/org.talend.designer.components.libs/libs_src/AddressDoctorClient/build.xml index 1b26992acad..b45288acdc5 100644 --- a/main/plugins/org.talend.designer.components.libs/libs_src/AddressDoctorClient/build.xml +++ b/main/plugins/org.talend.designer.components.libs/libs_src/AddressDoctorClient/build.xml @@ -16,8 +16,8 @@ - - + + diff --git a/main/plugins/org.talend.designer.components.libs/libs_src/mqrfh2header/build.xml b/main/plugins/org.talend.designer.components.libs/libs_src/mqrfh2header/build.xml index 62e917a29bb..5b1357a2a62 100644 --- a/main/plugins/org.talend.designer.components.libs/libs_src/mqrfh2header/build.xml +++ b/main/plugins/org.talend.designer.components.libs/libs_src/mqrfh2header/build.xml @@ -17,7 +17,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.libs/libs_src/sugarCRMManagement/build.xml b/main/plugins/org.talend.designer.components.libs/libs_src/sugarCRMManagement/build.xml index c0f45fbb307..f6e988babd4 100644 --- a/main/plugins/org.talend.designer.components.libs/libs_src/sugarCRMManagement/build.xml +++ b/main/plugins/org.talend.designer.components.libs/libs_src/sugarCRMManagement/build.xml @@ -16,8 +16,8 @@ - - + + diff --git a/main/plugins/org.talend.designer.components.localprovider/build.properties b/main/plugins/org.talend.designer.components.localprovider/build.properties index e2227977410..57b8a8aff63 100644 --- a/main/plugins/org.talend.designer.components.localprovider/build.properties +++ b/main/plugins/org.talend.designer.components.localprovider/build.properties @@ -16,12 +16,12 @@ bin.excludes = components/tAlfrescoOutput/wstx-lgpl-3.2.7.jar,\ components/tNamedPipeOutput/namedpipe_jni_64bit.dll,\ components/tNetezzaNzLoad/namedpipe_jni_64bit.dll,\ components/tGreenplumGPLoad/namedpipe-1.0.jar,\ - components/tRSSInput/nekohtml.jar,\ + components/tRSSInput/nekohtml-0.9.5.jar,\ components/tAlfrescoOutput/wstx-lgpl-3.2.7.jar,\ - components/tAdvancedXMLMapHash/trove.jar,\ + components/tAdvancedXMLMapHash/trove-1.0.2.jar,\ components/tLineChart/jcommon-1.0.6.jar,\ components/tMomInput/jnp-client.jar,\ - components/tMomInput/javassist.jar,\ + components/tMomInput/javassist-3.10.0.GA.jar,\ components/tBonitaDeploy/cglib-nodep-2.1_3.jar,\ components/tBonitaDeploy/javassist-3.12.0.GA.jar,\ components/tBonitaDeploy/javassist-3.8.0.GA.jar,\ diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlConnection/tAmazonMysqlConnection_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlConnection/tAmazonMysqlConnection_java.xml index 67acef4703d..c2bb7828441 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlConnection/tAmazonMysqlConnection_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlConnection/tAmazonMysqlConnection_java.xml @@ -163,7 +163,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleConnection/tAmazonOracleConnection_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleConnection/tAmazonOracleConnection_java.xml index 5132bbff653..0c36c70138e 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleConnection/tAmazonOracleConnection_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleConnection/tAmazonOracleConnection_java.xml @@ -242,7 +242,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleInput/tAmazonOracleInput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleInput/tAmazonOracleInput_java.xml index d2f819d39a9..fbc09cf72b4 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleInput/tAmazonOracleInput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleInput/tAmazonOracleInput_java.xml @@ -167,7 +167,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleOutput/tAmazonOracleOutput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleOutput/tAmazonOracleOutput_java.xml index e637e7368b5..7dbdbb91cb7 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleOutput/tAmazonOracleOutput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleOutput/tAmazonOracleOutput_java.xml @@ -459,7 +459,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleRow/tAmazonOracleRow_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleRow/tAmazonOracleRow_java.xml index eb1343c5833..7acd35f1005 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleRow/tAmazonOracleRow_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleRow/tAmazonOracleRow_java.xml @@ -341,7 +341,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tBarChart/tBarChart_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tBarChart/tBarChart_java.xml index 6a957e46336..90c700a1526 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tBarChart/tBarChart_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tBarChart/tBarChart_java.xml @@ -87,8 +87,8 @@ - - + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tBonitaDeploy/tBonitaDeploy_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tBonitaDeploy/tBonitaDeploy_java.xml index a1892b8686d..953e0310d00 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tBonitaDeploy/tBonitaDeploy_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tBonitaDeploy/tBonitaDeploy_java.xml @@ -119,8 +119,8 @@ - - + + @@ -130,10 +130,10 @@ - - - - + + + + @@ -144,7 +144,7 @@ - + @@ -155,9 +155,9 @@ - + - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tBonitaInstantiateProcess/tBonitaInstantiateProcess_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tBonitaInstantiateProcess/tBonitaInstantiateProcess_java.xml index b1c454b581f..1db2f6627c5 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tBonitaInstantiateProcess/tBonitaInstantiateProcess_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tBonitaInstantiateProcess/tBonitaInstantiateProcess_java.xml @@ -158,8 +158,8 @@ - - + + @@ -170,10 +170,10 @@ - - - - + + + + @@ -184,7 +184,7 @@ - + @@ -196,9 +196,9 @@ - + - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_java.xml index 4dcf9482ae1..5bf083a121e 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_java.xml @@ -852,12 +852,12 @@ - + - + @@ -866,9 +866,9 @@ - - - + + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tDropboxConnection/tDropboxConnection_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tDropboxConnection/tDropboxConnection_java.xml index a588baeef2f..4bde77f0836 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tDropboxConnection/tDropboxConnection_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tDropboxConnection/tDropboxConnection_java.xml @@ -58,7 +58,7 @@ - - diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tELTOracleMap/tELTOracleMap_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tELTOracleMap/tELTOracleMap_java.xml index a7bc8daa4fc..ba655ae4ea1 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tELTOracleMap/tELTOracleMap_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tELTOracleMap/tELTOracleMap_java.xml @@ -259,7 +259,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tExtractJSONFields/tExtractJSONFields_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tExtractJSONFields/tExtractJSONFields_java.xml index 475c62e62b2..50d157eb697 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tExtractJSONFields/tExtractJSONFields_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tExtractJSONFields/tExtractJSONFields_java.xml @@ -184,15 +184,15 @@ - - + + - + - - + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tFileFetch/tFileFetch_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tFileFetch/tFileFetch_java.xml index d71d2aaaa49..1d2e16db4c5 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tFileFetch/tFileFetch_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tFileFetch/tFileFetch_java.xml @@ -433,7 +433,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tFileInputExcel/tFileInputExcel_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tFileInputExcel/tFileInputExcel_java.xml index fe2a2d2596b..2c25d13fdd0 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tFileInputExcel/tFileInputExcel_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tFileInputExcel/tFileInputExcel_java.xml @@ -186,7 +186,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tFileInputJSON/tFileInputJSON_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tFileInputJSON/tFileInputJSON_java.xml index 57d23cb5354..028ae380e08 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tFileInputJSON/tFileInputJSON_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tFileInputJSON/tFileInputJSON_java.xml @@ -164,7 +164,7 @@ - @@ -175,9 +175,9 @@ - - @@ -185,13 +185,13 @@ REQUIRED_IF="(READ_BY == 'XPATH')" /> - - - diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tFileInputMail/tFileInputMail_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tFileInputMail/tFileInputMail_java.xml index aab52d61e4e..ce42cc035b5 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tFileInputMail/tFileInputMail_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tFileInputMail/tFileInputMail_java.xml @@ -86,7 +86,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tFileInputProperties/tFileInputProperties_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tFileInputProperties/tFileInputProperties_java.xml index 4998a9dc3d4..d410645f32f 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tFileInputProperties/tFileInputProperties_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tFileInputProperties/tFileInputProperties_java.xml @@ -93,7 +93,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tFileOutputExcel/tFileOutputExcel_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tFileOutputExcel/tFileOutputExcel_java.xml index bb8a88e4484..3ebeefd509f 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tFileOutputExcel/tFileOutputExcel_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tFileOutputExcel/tFileOutputExcel_java.xml @@ -240,7 +240,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tFileOutputJSON/tFileOutputJSON_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tFileOutputJSON/tFileOutputJSON_java.xml index bf977542ee1..039de32f428 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tFileOutputJSON/tFileOutputJSON_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tFileOutputJSON/tFileOutputJSON_java.xml @@ -71,7 +71,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tFileOutputProperties/tFileOutputProperties_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tFileOutputProperties/tFileOutputProperties_java.xml index 641a65a0a6c..6f95f0dd352 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tFileOutputProperties/tFileOutputProperties_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tFileOutputProperties/tFileOutputProperties_java.xml @@ -79,7 +79,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tFileRowCount/tFileRowCount_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tFileRowCount/tFileRowCount_java.xml index 4404c072690..ea8360200bc 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tFileRowCount/tFileRowCount_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tFileRowCount/tFileRowCount_java.xml @@ -62,7 +62,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tFirebirdConnection/tFirebirdConnection_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tFirebirdConnection/tFirebirdConnection_java.xml index 08b953f77bd..4b5a314a655 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tFirebirdConnection/tFirebirdConnection_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tFirebirdConnection/tFirebirdConnection_java.xml @@ -147,7 +147,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tFirebirdInput/tFirebirdInput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tFirebirdInput/tFirebirdInput_java.xml index b4300b93eb1..4f0ab4a04f4 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tFirebirdInput/tFirebirdInput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tFirebirdInput/tFirebirdInput_java.xml @@ -210,7 +210,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tFirebirdOutput/tFirebirdOutput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tFirebirdOutput/tFirebirdOutput_java.xml index 03829b906bd..794a553d23a 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tFirebirdOutput/tFirebirdOutput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tFirebirdOutput/tFirebirdOutput_java.xml @@ -318,7 +318,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tFirebirdRow/tFirebirdRow_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tFirebirdRow/tFirebirdRow_java.xml index ae9b2143d02..5805ae5bc85 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tFirebirdRow/tFirebirdRow_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tFirebirdRow/tFirebirdRow_java.xml @@ -257,7 +257,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_java.xml index 707067b5758..6bc1cdca53f 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_java.xml @@ -679,15 +679,15 @@ diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_java.xml index 0ace39b3691..1a4e6adba3a 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_java.xml @@ -758,15 +758,15 @@ diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tJavaDBInput/tJavaDBInput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tJavaDBInput/tJavaDBInput_java.xml index 86c1aa3ce02..85744ce3cbd 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tJavaDBInput/tJavaDBInput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tJavaDBInput/tJavaDBInput_java.xml @@ -210,9 +210,9 @@ - - - + + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tJavaDBOutput/tJavaDBOutput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tJavaDBOutput/tJavaDBOutput_java.xml index c52b2682595..1a81f6d6155 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tJavaDBOutput/tJavaDBOutput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tJavaDBOutput/tJavaDBOutput_java.xml @@ -301,9 +301,9 @@ - - - + + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tJavaDBRow/tJavaDBRow_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tJavaDBRow/tJavaDBRow_java.xml index d7b41a6bb08..b79d248c74b 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tJavaDBRow/tJavaDBRow_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tJavaDBRow/tJavaDBRow_java.xml @@ -273,9 +273,9 @@ - - - + + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tLineChart/tLineChart_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tLineChart/tLineChart_java.xml index 1ed45a1c5b2..2a67e6d12df 100755 --- a/main/plugins/org.talend.designer.components.localprovider/components/tLineChart/tLineChart_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tLineChart/tLineChart_java.xml @@ -132,8 +132,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 8826a68eb3c..eb23ffcdf07 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 @@ -27561,8 +27561,8 @@ - - + + @@ -27594,12 +27594,12 @@ - + - - + + @@ -27609,7 +27609,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 33f2b175a72..f2eab50cec3 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 @@ -38319,8 +38319,8 @@ - - + + @@ -38352,12 +38352,12 @@ - + - - + + @@ -38367,7 +38367,7 @@ diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tMomConnection/tMomConnection_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tMomConnection/tMomConnection_java.xml index 8361b2823f5..071ee85c793 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tMomConnection/tMomConnection_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tMomConnection/tMomConnection_java.xml @@ -184,7 +184,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tMomInputLoop/tMomInputLoop_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tMomInputLoop/tMomInputLoop_java.xml index 1e70276ce5e..aa64f782dc7 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tMomInputLoop/tMomInputLoop_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tMomInputLoop/tMomInputLoop_java.xml @@ -310,17 +310,16 @@ - + - - + - + - - + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tMomOutput/tMomOutput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tMomOutput/tMomOutput_java.xml index 6bf0e086df6..65d246de796 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tMomOutput/tMomOutput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tMomOutput/tMomOutput_java.xml @@ -435,17 +435,17 @@ - + - + - + - - + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tOracleBulkExec/tOracleBulkExec_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tOracleBulkExec/tOracleBulkExec_java.xml index 626bd3207a1..0d9f0c951f9 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tOracleBulkExec/tOracleBulkExec_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tOracleBulkExec/tOracleBulkExec_java.xml @@ -784,7 +784,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tOracleConnection/tOracleConnection_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tOracleConnection/tOracleConnection_java.xml index 9fc28cec0df..fda6d259879 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tOracleConnection/tOracleConnection_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tOracleConnection/tOracleConnection_java.xml @@ -367,7 +367,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tOracleInput/tOracleInput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tOracleInput/tOracleInput_java.xml index e10749cb67a..5123497f45d 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tOracleInput/tOracleInput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tOracleInput/tOracleInput_java.xml @@ -216,7 +216,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tOracleOutput/tOracleOutput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tOracleOutput/tOracleOutput_java.xml index d7ee00de310..188caff6239 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tOracleOutput/tOracleOutput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tOracleOutput/tOracleOutput_java.xml @@ -541,7 +541,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tOracleOutputBulkExec/tOracleOutputBulkExec_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tOracleOutputBulkExec/tOracleOutputBulkExec_java.xml index 9edf6bcc7f2..ebda06ef61b 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tOracleOutputBulkExec/tOracleOutputBulkExec_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tOracleOutputBulkExec/tOracleOutputBulkExec_java.xml @@ -749,7 +749,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tOracleRow/tOracleRow_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tOracleRow/tOracleRow_java.xml index 56d1a358d29..5617a2dd485 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tOracleRow/tOracleRow_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tOracleRow/tOracleRow_java.xml @@ -385,7 +385,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tOracleSCD/tOracleSCD_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tOracleSCD/tOracleSCD_java.xml index bfc24b32798..04008027610 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tOracleSCD/tOracleSCD_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tOracleSCD/tOracleSCD_java.xml @@ -590,7 +590,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tOracleSCDELT/tOracleSCDELT_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tOracleSCDELT/tOracleSCDELT_java.xml index d1998888ea0..2b79e1a7cc1 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tOracleSCDELT/tOracleSCDELT_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tOracleSCDELT/tOracleSCDELT_java.xml @@ -456,7 +456,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tOracleSP/tOracleSP_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tOracleSP/tOracleSP_java.xml index 06eab3cd1e4..3c736641233 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tOracleSP/tOracleSP_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tOracleSP/tOracleSP_java.xml @@ -503,7 +503,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tPOP/tPOP_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tPOP/tPOP_java.xml index bbc2b3998a3..9d8004212c0 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tPOP/tPOP_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tPOP/tPOP_java.xml @@ -254,7 +254,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tRSSInput/tRSSInput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tRSSInput/tRSSInput_java.xml index 086405f25e6..878c331c2f7 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tRSSInput/tRSSInput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tRSSInput/tRSSInput_java.xml @@ -155,7 +155,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tSOAP/tSOAP_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tSOAP/tSOAP_java.xml index d243d15746e..dc8d3d8d52d 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tSOAP/tSOAP_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tSOAP/tSOAP_java.xml @@ -144,7 +144,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tSendMail/tSendMail_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tSendMail/tSendMail_java.xml index 26aa3d53258..7e8afd0482e 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tSendMail/tSendMail_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tSendMail/tSendMail_java.xml @@ -239,7 +239,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tWebService/tWebService_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tWebService/tWebService_java.xml index 93f885fb548..10269758bca 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tWebService/tWebService_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tWebService/tWebService_java.xml @@ -295,7 +295,7 @@ @@ -335,8 +335,8 @@ diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tWebServiceInput/tWebServiceInput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tWebServiceInput/tWebServiceInput_java.xml index c71689cf7d4..dc5493c0f68 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tWebServiceInput/tWebServiceInput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tWebServiceInput/tWebServiceInput_java.xml @@ -214,12 +214,12 @@ for(int i = 0; i < result.length; i++){ - - + - + @@ -233,8 +233,8 @@ for(int i = 0; i < result.length; i++){ /> @@ -328,7 +328,7 @@ for(int i = 0; i < result.length; i++){ diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tWriteJSONFieldIn/tWriteJSONFieldIn_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tWriteJSONFieldIn/tWriteJSONFieldIn_java.xml index a8dc157f98a..86459d036c5 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tWriteJSONFieldIn/tWriteJSONFieldIn_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tWriteJSONFieldIn/tWriteJSONFieldIn_java.xml @@ -84,8 +84,8 @@ - - + + diff --git a/main/plugins/org.talend.designer.components.localprovider/components/tXMLRPCInput/tXMLRPCInput_java.xml b/main/plugins/org.talend.designer.components.localprovider/components/tXMLRPCInput/tXMLRPCInput_java.xml index c5c356f7651..ef1e5fec245 100644 --- a/main/plugins/org.talend.designer.components.localprovider/components/tXMLRPCInput/tXMLRPCInput_java.xml +++ b/main/plugins/org.talend.designer.components.localprovider/components/tXMLRPCInput/tXMLRPCInput_java.xml @@ -125,7 +125,7 @@ - + diff --git a/main/plugins/org.talend.designer.components.localprovider/plugin.xml b/main/plugins/org.talend.designer.components.localprovider/plugin.xml index 0eedbcd244a..aeead7ce8ac 100644 --- a/main/plugins/org.talend.designer.components.localprovider/plugin.xml +++ b/main/plugins/org.talend.designer.components.localprovider/plugin.xml @@ -52,15 +52,15 @@ + mvn_uri="mvn:javax.ws.rs/javax.ws.rs-api/2.0-m10"> @@ -101,17 +101,17 @@ listString = new ArrayList(); - listString.add("mvn:org.talend.libraries/mysql-connector-java-5.1.30-bin/6.0.0"); + listString.add("mvn:mysql/mysql-connector-java/5.1.30"); listString.add("mvn:org.talend.libraries/mysql-connector-java-5.1.40-bin/6.0.0"); String jars = GenericTableUtils.getDriverJarPaths(listString); assertEquals(jars, - "mvn:org.talend.libraries/mysql-connector-java-5.1.30-bin/6.0.0;mvn:org.talend.libraries/mysql-connector-java-5.1.40-bin/6.0.0"); + "mvn:mysql/mysql-connector-java/5.1.30;mvn:org.talend.libraries/mysql-connector-java-5.1.40-bin/6.0.0"); listString = new ArrayList(); - listString.add("mysql-connector-java-5.1.30-bin.jar"); + listString.add("mysql-connector-java-5.1.30.jar"); listString.add("mysql-connector-java-5.1.40-bin.jar"); jars = GenericTableUtils.getDriverJarPaths(listString); - assertEquals(jars, "mysql-connector-java-5.1.30-bin.jar;mysql-connector-java-5.1.40-bin.jar"); + assertEquals(jars, "mysql-connector-java-5.1.30.jar;mysql-connector-java-5.1.40-bin.jar"); listString = new ArrayList(); listString.add("context.jdbc1_drivers"); diff --git a/test/plugins/org.talend.designer.core.generic.test/src/main/java/org/talend/designer/core/generic/utils/ComponentsUtilsTest.java b/test/plugins/org.talend.designer.core.generic.test/src/main/java/org/talend/designer/core/generic/utils/ComponentsUtilsTest.java index 5f1048988dc..0807aea66fe 100644 --- a/test/plugins/org.talend.designer.core.generic.test/src/main/java/org/talend/designer/core/generic/utils/ComponentsUtilsTest.java +++ b/test/plugins/org.talend.designer.core.generic.test/src/main/java/org/talend/designer/core/generic/utils/ComponentsUtilsTest.java @@ -301,7 +301,7 @@ public class ComponentsUtilsTest { assertEquals("\"\"", parameterValue); //$NON-NLS-1$ List cList = new ArrayList(); - cList.add("mvn:org.talend.libraries/mysql-connector-java-5.1.30-bin/6.0.0"); + cList.add("mvn:mysql/mysql-connector-java/5.1.30"); testProperty.setStoredValue(cList); parameterValue = ComponentsUtils.getParameterValue(node, testProperty, testFieldType, testParamName); assertEquals(null, parameterValue); //$NON-NLS-1$ diff --git a/test/plugins/org.talend.designer.core.test/src/org/talend/designer/core/utils/ConnectionUtilTest.java b/test/plugins/org.talend.designer.core.test/src/org/talend/designer/core/utils/ConnectionUtilTest.java index 31574407ca2..97414f198a8 100644 --- a/test/plugins/org.talend.designer.core.test/src/org/talend/designer/core/utils/ConnectionUtilTest.java +++ b/test/plugins/org.talend.designer.core.test/src/org/talend/designer/core/utils/ConnectionUtilTest.java @@ -75,10 +75,10 @@ public class ConnectionUtilTest { List list = new ArrayList>(); Map map = new HashMap(); list.add(map); - map.put("drivers", "mvn:org.talend.libraries/mysql-connector-java-5.1.30-bin/6.0.0");//$NON-NLS-1$//$NON-NLS-2$ + map.put("drivers", "mvn:mysql/mysql-connector-java/5.1.30");//$NON-NLS-1$//$NON-NLS-2$ ConnectionUtil.getDriverJar(list); Assert.assertEquals(1, map.size()); - Assert.assertEquals("mysql-connector-java-5.1.30-bin.jar", map.get("drivers")); //$NON-NLS-1$//$NON-NLS-2$ + Assert.assertEquals("mysql-connector-java-5.1.30.jar", map.get("drivers")); //$NON-NLS-1$//$NON-NLS-2$ } @Test @@ -140,10 +140,10 @@ public class ConnectionUtilTest { List list = new ArrayList>(); Map map = new HashMap(); list.add(map); - map.put("drivers", "mvn:org.talend.libraries/mysql-connector-java-5.1.30-bin/6.0.0");//$NON-NLS-1$//$NON-NLS-2$ + map.put("drivers", "mvn:mysql/mysql-connector-java/5.1.30");//$NON-NLS-1$//$NON-NLS-2$ ConnectionUtil.getDriverJar(list); Assert.assertEquals(1, map.size()); - Assert.assertEquals("mysql-connector-java-5.1.30-bin.jar", map.get("drivers")); //$NON-NLS-1$//$NON-NLS-2$ + Assert.assertEquals("mysql-connector-java-5.1.30.jar", map.get("drivers")); //$NON-NLS-1$//$NON-NLS-2$ } @Test @@ -180,8 +180,8 @@ public class ConnectionUtilTest { @Test public void testGetDriverJarFromMvnUrlMysql5() { - Assert.assertEquals("mysql-connector-java-5.1.30-bin.jar", //$NON-NLS-1$ - ConnectionUtil.getDriverJarFromMvnUrl("mvn:org.talend.libraries/mysql-connector-java-5.1.30-bin/6.0.0")); //$NON-NLS-1$ + Assert.assertEquals("mysql-connector-java-5.1.30.jar", //$NON-NLS-1$ + ConnectionUtil.getDriverJarFromMvnUrl("mvn:mysql/mysql-connector-java/5.1.30")); //$NON-NLS-1$ } @Test