Merge pull request #1030 from Talend/feature/DEVOPS-1729/patch/6.1.1s/TPS-1425_nexus

DEVOPS-1729 Nexus migration: Update URLs [patch/6.1.1s/TPS-1425]

i18n/plugins/org.talend.componentdesigner.nl/pom.xml

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

i18n/plugins/org.talend.componentdesigner.rcp.nl/pom.xml

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

i18n/plugins/org.talend.designer.abstractmap.nl/pom.xml

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

i18n/plugins/org.talend.designer.alfrescooutput.nl/pom.xml

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

i18n/plugins/org.talend.designer.business.diagram.nl/pom.xml

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

i18n/plugins/org.talend.designer.codegen.nl/pom.xml

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

i18n/plugins/org.talend.designer.components.exchange.nl/pom.xml

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

i18n/plugins/org.talend.designer.core.nl/pom.xml

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

i18n/plugins/org.talend.designer.dbmap.nl/pom.xml

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

i18n/plugins/org.talend.designer.documentation.nl/pom.xml

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

i18n/plugins/org.talend.designer.fileoutputxml.nl/pom.xml

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

i18n/plugins/org.talend.designer.gefabstractmap.nl/pom.xml

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

i18n/plugins/org.talend.designer.hl7.nl/pom.xml

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

i18n/plugins/org.talend.designer.mapper.nl/pom.xml

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

i18n/plugins/org.talend.designer.maven.job.nl/pom.xml

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

i18n/plugins/org.talend.designer.rowgenerator.nl/pom.xml

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

i18n/plugins/org.talend.designer.runprocess.nl/pom.xml

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

i18n/plugins/org.talend.designer.scd.nl/pom.xml

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

i18n/plugins/org.talend.designer.webservice.nl/pom.xml

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

i18n/plugins/org.talend.designer.xmlmap.nl/pom.xml

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

i18n/plugins/org.talend.expressionbuilder.nl/pom.xml

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

i18n/plugins/org.talend.presentation.onboarding.resource.nl/pom.xml

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

i18n/plugins/org.talend.presentation.onboarding.resource.tos.nl/pom.xml

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

i18n/plugins/org.talend.repository.ftp.nl/pom.xml

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

i18n/plugins/org.talend.repository.json.nl/pom.xml

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

i18n/plugins/org.talend.repository.nl/pom.xml

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

i18n/plugins/org.talend.repository.view.di.nl/pom.xml

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

i18n/plugins/org.talend.sbi.engines.client.nl/pom.xml

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

i18n/plugins/org.talend.spagic.engines.client.nl/pom.xml

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

i18n/plugins/org.talend.sqlbuilder.nl/pom.xml

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

main/features/org.talend.componentdesigner.feature/pom.xml

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

main/features/org.talend.designer.business.feature/pom.xml

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

main/features/org.talend.designer.feature.patch/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.designer.feature.patch</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

main/features/org.talend.designer.feature.patch/build.properties

@@ -0,0 +1 @@
+bin.includes = feature.xml

main/features/org.talend.designer.feature.patch/feature.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.designer.feature.patch"
+      label="Patch"
+      version="6.1.1.qualifier"
+      license-feature="org.talend.tup.patch.feature"
+      license-feature-version="6.1.1.qualifier">
+
+   <requires>
+      <import feature="org.talend.designer.feature" version="6.1.1.qualifier" patch="true"/>
+   </requires>
+
+   <plugin
+         id="org.talend.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

main/features/org.talend.designer.feature/pom.xml

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

main/features/org.talend.rcp.branding.tos.feature/pom.xml

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

main/features/org.talend.rcp.branding.tos.test.feature/pom.xml

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

main/features/org.talend.repository.feature.patch/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.repository.feature.patch</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

main/features/org.talend.repository.feature.patch/build.properties

@@ -0,0 +1 @@
+bin.includes = feature.xml

main/features/org.talend.repository.feature.patch/feature.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.repository.feature.patch"
+      label="Patch"
+      version="6.1.1.qualifier"
+      license-feature="org.talend.tup.patch.feature"
+      license-feature-version="6.1.1.qualifier">
+
+   <requires>
+      <import feature="org.talend.repository.feature" version="6.1.1.qualifier" patch="true"/>
+   </requires>
+
+   <plugin
+         id="org.talend.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

main/features/org.talend.repository.feature/pom.xml

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

main/features/org.talend.sbi.feature/pom.xml

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

main/features/org.talend.spagic.feature/pom.xml

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

main/features/org.talend.tos.components.feature/pom.xml

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

main/features/org.talend.tos.feature/pom.xml

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

main/features/org.talend.tos.libraries.feature/pom.xml

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

main/plugins/org.talend.component.core/pom.xml

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

main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/model/Component.java

@@ -56,6 +56,7 @@ import org.talend.core.model.temp.ECodePart;
 import org.talend.core.model.utils.TalendTextUtils;
 import org.talend.core.prefs.ITalendCorePrefConstants;
 import org.talend.core.ui.services.IComponentsLocalProviderService;
+import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.designer.core.DesignerPlugin;
 import org.talend.designer.core.model.components.AbstractComponent;
 import org.talend.designer.core.model.components.DummyComponent;
@@ -1633,7 +1634,8 @@ public class Component extends AbstractComponent {
             return "\"" + value + "\"";//$NON-NLS-1$ //$NON-NLS-2$
         }
         if (property.getType() == SchemaElement.Type.SCHEMA) {
-            return "\"" + value.replace("\"", "\\\"") + "\"";//$NON-NLS-1$ //$NON-NLS-2$
+        	// Handles embedded escaped quotes which might occur
+            return "\"" + value.replace("\\\"",	"\\\\\"").replace("\"", "\\\"") + "\"";//$NON-NLS-1$ //$NON-NLS-2$
         }
         return value;
     }

main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/utils/SchemaUtils.java

@@ -15,14 +15,18 @@ package org.talend.component.core.utils;
 import java.util.List;
 
 import org.talend.component.core.constants.IGenericConstants;
+import org.talend.components.api.properties.ComponentProperties;
+import org.talend.components.api.properties.ComponentProperties.Deserialized;
 import org.talend.components.api.schema.Schema;
 import org.talend.components.api.schema.SchemaElement;
 import org.talend.components.api.schema.SchemaElement.Type;
+import org.talend.core.model.metadata.IMetadataTable;
 import org.talend.core.model.metadata.builder.connection.ConnectionFactory;
 import org.talend.core.model.metadata.builder.connection.MetadataColumn;
 import org.talend.core.model.metadata.builder.connection.MetadataTable;
 import org.talend.core.model.metadata.types.JavaTypesManager;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
+import org.talend.core.repository.model.repositoryObject.MetadataTableRepositoryObject;
 import org.talend.repository.model.IProxyRepositoryFactory;
 import orgomg.cwm.objectmodel.core.CoreFactory;
 import orgomg.cwm.objectmodel.core.TaggedValue;
@@ -96,4 +100,24 @@ public class SchemaUtils {
         metadataColumn.setDefaultValue(schemaElement.getDefaultValue());
     }
 
+    public static ComponentProperties getCurrentComponentProperties(IMetadataTable table) {
+        if (table != null && table instanceof MetadataTableRepositoryObject) {
+            MetadataTableRepositoryObject metaTableRepObj = (MetadataTableRepositoryObject) table;
+            MetadataTable metadataTable = metaTableRepObj.getTable();
+            if (metadataTable != null && metadataTable.getTaggedValue() != null) {
+                for (TaggedValue serializedProps : metadataTable.getTaggedValue()) {
+                    if (IGenericConstants.COMPONENT_PROPERTIES_TAG.equals(serializedProps.getTag())) {
+                        String serializedProperties = serializedProps.getValue();
+                        if (serializedProperties != null) {
+                            Deserialized fromSerializedProperties = ComponentProperties.fromSerialized(serializedProperties);
+                            if (fromSerializedProperties != null) {
+                                return fromSerializedProperties.properties;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return null;
+    }
 }

main/plugins/org.talend.component.ui.wizard/plugin.xml

@@ -162,4 +162,13 @@
             class="org.talend.component.ui.wizard.ui.context.handler.GenericRepositoryContextHandler">
       </RepositoryContext>
    </extension>
+   <extension
+         point="org.talend.core.repository.repository_node_provider">
+      <repositoryNode
+            class="org.talend.component.ui.wizard.model.FakeGenericExtendNode"
+            label="FakeGenericNode"
+            products="DI"
+            type="FakeGenericNodeType">
+      </repositoryNode>
+   </extension>
 </plugin>

main/plugins/org.talend.component.ui.wizard/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.1.1-SNAPSHOT</version>
+    <version>6.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.component.ui.wizard</artifactId>

main/plugins/org.talend.component.ui.wizard/src/main/java/org/talend/component/ui/wizard/controller/NameAndLabelsReferenceController.java

@@ -16,6 +16,7 @@ import java.beans.PropertyChangeEvent;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.fieldassist.DecoratedField;
@@ -36,12 +37,10 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
 import org.talend.commons.ui.runtime.image.ImageProvider;
 import org.talend.component.core.model.GenericElementParameter;
-import org.talend.component.ui.wizard.ui.DynamicComposite;
 import org.talend.components.api.properties.NameAndLabel;
 import org.talend.core.model.process.IElementParameter;
 import org.talend.core.ui.CoreUIPlugin;
 import org.talend.core.ui.properties.tab.IDynamicProperty;
-import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.designer.core.i18n.Messages;
 import org.talend.designer.core.ui.editor.nodes.Node;
 import org.talend.designer.core.ui.editor.properties.controllers.AbstractElementPropertySectionController;
@@ -56,13 +55,8 @@ public class NameAndLabelsReferenceController extends AbstractElementPropertySec
 
     private static final String MODULE = "MODULE"; //$NON-NLS-1$
 
-    private boolean isWizard;
-
     public NameAndLabelsReferenceController(IDynamicProperty dp) {
         super(dp);
-        if (dynamicProperty instanceof DynamicComposite) {
-            isWizard = ((DynamicComposite) dynamicProperty).isWizard();
-        }
     }
 
     public Command createCommand() {
@@ -83,19 +77,16 @@ public class NameAndLabelsReferenceController extends AbstractElementPropertySec
                         }
                     }
                 }
+                NameAndLabelsDialog nameAndLabelsDialog = new NameAndLabelsDialog(composite.getShell(), nals);
+                if (nameAndLabelsDialog.open() == IDialogConstants.OK_ID) {
+                    String propertyName = (String) button.getData(PARAMETER_NAME);
+                    String result = StringUtils.trimToEmpty(nameAndLabelsDialog.getResult());
+                    Text moduleText = (Text) hashCurControls.get(propertyName);
+                    moduleText.setText(result);
+                    curParameter.setValue(result);
+                }
             }
         }
-        NameAndLabelsDialog nameAndLabelsDialog = new NameAndLabelsDialog(composite.getShell(), nals);
-        if (nameAndLabelsDialog.open() == IDialogConstants.OK_ID) {
-            String propertyName = (String) button.getData(PARAMETER_NAME);
-            String result = nameAndLabelsDialog.getResult();
-            if (!isWizard) {
-                result = TalendQuoteUtils.addQuotesIfNotExist(result);
-            }
-            Text moduleText = (Text) hashCurControls.get(propertyName);
-            moduleText.setText(result);
-            curParameter.setValue(result);
-        }
         return null;
     }
 
@@ -154,6 +145,7 @@ public class NameAndLabelsReferenceController extends AbstractElementPropertySec
         Control cLayout = dField.getLayoutControl();
         Text moduleText = (Text) dField.getControl();
         moduleText.setData(PARAMETER_NAME, param.getName());
+        moduleText.setEditable(false);
         cLayout.setBackground(subComposite.getBackground());
 
         addDragAndDropTarget(moduleText);

main/plugins/org.talend.component.ui.wizard/src/main/java/org/talend/component/ui/wizard/model/FakeGenericExtendNode.java

@@ -0,0 +1,44 @@
+package org.talend.component.ui.wizard.model;
+
+import org.talend.commons.ui.runtime.image.IImage;
+import org.talend.commons.ui.runtime.repository.IExtendRepositoryNode;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.runtime.services.IGenericWizardService;
+
+/**
+ * 
+ * created by ycbai on 2015年12月7日 Detailled comment
+ *
+ */
+public class FakeGenericExtendNode implements IExtendRepositoryNode {
+
+    public FakeGenericExtendNode() {
+        initGenericTypes();
+    }
+
+    private void initGenericTypes() {
+        IGenericWizardService wizardService = null;
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
+            wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault().getService(IGenericWizardService.class);
+        }
+        if (wizardService != null) {
+            wizardService.createNodesFromComponentService(null); // Just use to init generic types.
+        }
+    }
+
+    @Override
+    public IImage getNodeImage() {
+        return null;
+    }
+
+    @Override
+    public int getOrdinal() {
+        return 1000;
+    }
+
+    @Override
+    public Object[] getChildren() {
+        return null;
+    }
+
+}

main/plugins/org.talend.component.ui.wizard/src/main/java/org/talend/component/ui/wizard/service/GenericWizardService.java

@@ -67,8 +67,10 @@ public class GenericWizardService implements IGenericWizardService {
             String folder = "metadata/" + name; //$NON-NLS-1$  //TODO: maybe need to retrieve it from component service?
             int ordinal = 100;
             ERepositoryObjectType repositoryType = internalService.createRepositoryType(name, displayName, name, folder, ordinal);
-            repNodes.add(internalService.createRepositoryNode(curParentNode, wizardDefinition.getDisplayName(), repositoryType,
-                    ENodeType.SYSTEM_FOLDER));
+            if (curParentNode != null) {
+                repNodes.add(internalService.createRepositoryNode(curParentNode, wizardDefinition.getDisplayName(),
+                        repositoryType, ENodeType.SYSTEM_FOLDER));
+            }
         }
         return repNodes;
     }

main/plugins/org.talend.component.ui.wizard/src/main/java/org/talend/component/ui/wizard/ui/GenericConnWizard.java

@@ -16,7 +16,16 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang.exception.ExceptionUtils;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.IWizardContainer;
@@ -25,6 +34,7 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchWizard;
 import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.ui.swt.dialogs.ErrorDialogWidthDetailArea;
 import org.talend.commons.utils.VersionUtils;
 import org.talend.component.core.constants.IGenericConstants;
@@ -214,11 +224,10 @@ public class GenericConnWizard extends CheckLastVersionRepositoryWizard {
                 }
             }
             try {
-                final IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
                 Form form = wizPage.getForm();
                 if (form.isCallAfterFormFinish()) {
                     if (creation) {
-                        factory.create(connectionItem, new Path("")); //$NON-NLS-1$
+                        createConnectionItem();
                     }
                     compService.afterFormFinish(form.getName(), form.getComponentProperties());
                 }
@@ -239,6 +248,27 @@ public class GenericConnWizard extends CheckLastVersionRepositoryWizard {
         }
     }
 
+    private void createConnectionItem() throws CoreException {
+        IWorkspace workspace = ResourcesPlugin.getWorkspace();
+        final IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
+        IWorkspaceRunnable operation = new IWorkspaceRunnable() {
+
+            @Override
+            public void run(IProgressMonitor monitor) throws CoreException {
+                try {
+                    factory.create(connectionItem, new Path("")); //$NON-NLS-1$;
+                } catch (PersistenceException e) {
+                    throw new CoreException(new Status(IStatus.ERROR, "org.talend.metadata.management.ui",
+                            "Error when create the connection", e));
+                }
+            }
+        };
+        ISchedulingRule schedulingRule = workspace.getRoot();
+        // the update the project files need to be done in the workspace runnable to avoid all
+        // notification of changes before the end of the modifications.
+        workspace.run(operation, schedulingRule, IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
+    }
+
     @Override
     public boolean performCancel() {
         if (!creation) {

main/plugins/org.talend.component.ui.wizard/src/main/java/org/talend/component/ui/wizard/ui/dnd/GenericDragAndDropHandler.java

@@ -22,10 +22,13 @@ import org.talend.component.core.constants.IComponentConstants;
 import org.talend.component.core.dnd.AbstractComponentDragAndDropHandler;
 import org.talend.component.core.model.GenericElementParameter;
 import org.talend.component.core.utils.ComponentsUtils;
+import org.talend.component.core.utils.SchemaUtils;
 import org.talend.component.ui.model.genericMetadata.GenericConnection;
 import org.talend.component.ui.model.genericMetadata.GenericConnectionItem;
 import org.talend.components.api.properties.ComponentProperties;
 import org.talend.components.api.properties.ComponentProperties.Deserialized;
+import org.talend.components.api.schema.SchemaElement;
+import org.talend.components.api.schema.SchemaElement.Type;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.components.EComponentType;
 import org.talend.core.model.components.IComponent;
@@ -90,19 +93,25 @@ public class GenericDragAndDropHandler extends AbstractComponentDragAndDropHandl
                     }
                 }
                 if (IComponentConstants.SCHEMA.equalsIgnoreCase(paramName)) {
-                    if (table != null) {
-                        tableName = table.getTableName();
-                        if (tableName != null) {
-                            // return table.getId() + " - " + tableName;//$NON-NLS-1$
+                    ComponentProperties componentModuleProperties = SchemaUtils.getCurrentComponentProperties(table);
+                    if (componentModuleProperties != null) {
+                        SchemaElement schemaElement = componentModuleProperties.getProperty(paramName);
+                        if (schemaElement != null && schemaElement instanceof ComponentProperties) {
+                            return ComponentsUtils.getGenericPropertyValue(componentModuleProperties, schemaElement.getName()
+                                    + IComponentConstants.EXP_SEPARATOR + paramName);
                         }
                     }
                 } else if (IComponentConstants.MODULENAME.equalsIgnoreCase(paramName)) {
-                    if (table != null) {
-                        tableName = table.getLabel();
-                        if (tableName == null) {
-                            tableName = table.getLabel();
+                    ComponentProperties componentModuleProperties = SchemaUtils.getCurrentComponentProperties(table);
+                    if (componentModuleProperties != null) {
+                        SchemaElement moduleElement = componentModuleProperties.getProperty(paramName);
+                        if (moduleElement != null) {
+                            if (Type.STRING.equals(moduleElement.getType())) {
+                                return getRepositoryValueOfStringType(connection, StringUtils.trimToNull(table.getLabel()));
+                            } else {
+                                return table.getLabel();
+                            }
                         }
-                        return getRepositoryValueOfStringType(connection, StringUtils.trimToNull(tableName));
                     }
                 } else if (IComponentConstants.QUERYMODE.equalsIgnoreCase(paramName)) {
                     if (ComponentsUtils.getGenericPropertyValue(componentProperties, value) != null) {

main/plugins/org.talend.component.ui.wizard/src/main/java/org/talend/component/ui/wizard/view/content/MetadataGenericContentProvider.java

@@ -17,6 +17,7 @@ import java.util.Set;
 
 import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.navigator.CommonNavigator;
 import org.eclipse.ui.navigator.CommonViewer;
 import org.talend.core.repository.model.ProjectRepositoryNode;
@@ -33,38 +34,6 @@ public class MetadataGenericContentProvider extends ProjectRepoDirectChildrenNod
 
     MetadataNodeTester metadataNodeTester = new MetadataNodeTester();
 
-    // private final class GenericNodeDirectChildrenNodeVisitor extends RunnableResourceVisitor {
-    //
-    // @Override
-    // protected boolean visit(IResourceDelta delta, Collection<Runnable> runnables) {
-    // VisitResourceHelper visitHelper = new VisitResourceHelper(delta);
-    // if (visitHelper.isIgnoredResource(delta)) {
-    // return false;
-    // }
-    // Set<RepositoryNode> topLevelNodes = getTopLevelNodes();
-    // if (topLevelNodes == null) {
-    // return false;
-    // }
-    // boolean visitChildren = true;
-    // for (final RepositoryNode repoNode : topLevelNodes) {
-    // if ((repoNode.getContentType() == ERepositoryObjectType.PROCESS)
-    // || (repoNode.getContentType() == ERepositoryObjectType.PROCESS_MR)) {
-    // visitChildren = false; // if valid, don't visit the children any more.
-    // if (viewer instanceof RepoViewCommonViewer) {
-    // runnables.add(new TopLevelNodeRunnable(repoNode) {
-    //
-    // @Override
-    // public void run() {
-    // refreshTopLevelNode(repoNode);
-    // }
-    // });
-    // }
-    // }
-    // }
-    // return visitChildren;
-    // }
-    // }
-
     private final class GenericNodeDirectChildrenNodeVisitor extends RunnableResourceVisitor {
 
         @Override
@@ -110,8 +79,9 @@ public class MetadataGenericContentProvider extends ProjectRepoDirectChildrenNod
             getTopLevelNodes().addAll(projectRepositoryNode.getGenericTopNodesMap().values());
             return getTopLevelNodes().toArray();
         }
-        if (getTopLevelNodes().contains(repoNode)) {
+        if (getTopLevelNodes().contains(repoNode) && !repoNode.isInitialized()) {
             projectRepositoryNode.initializeChildren(repoNode);
+            repoNode.setInitialized(true);
         }
         return repoNode.getChildren().toArray();
     }
@@ -144,4 +114,21 @@ public class MetadataGenericContentProvider extends ProjectRepoDirectChildrenNod
         return null;
     }
 
+    @Override
+    public void dispose() {
+        // visitor
+        if (this.viewer != null && this.genericNodeVisitor != null && this.viewer instanceof RepoViewCommonViewer) {
+            final Control control = this.viewer.getControl();
+            if (control != null && !control.isDisposed()) {
+                CommonNavigator commonNavigator = ((RepoViewCommonViewer) this.viewer).getCommonNavigator();
+                if (commonNavigator instanceof RepoViewCommonNavigator) {
+                    ((RepoViewCommonNavigator) commonNavigator).removeVisitor(this.genericNodeVisitor);
+                }
+            }
+        }
+
+        super.dispose();
+
+    }
+
 }

main/plugins/org.talend.componentdesigner.rcp/pom.xml

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

main/plugins/org.talend.componentdesigner/pom.xml

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

main/plugins/org.talend.designer.abstractmap/pom.xml

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

main/plugins/org.talend.designer.alfrescooutput/pom.xml

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

main/plugins/org.talend.designer.business.diagram/pom.xml

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

main/plugins/org.talend.designer.codegen/jet_stub/generic/component_begin.javajet

@@ -61,7 +61,8 @@ props_<%=cid %>.setRuntimeOnly().init();
 for (Component.CodegenPropInfo propInfo : propsToProcess) { // propInfo
 	List<SchemaElement> properties = propInfo.props.getProperties();
 	for (SchemaElement property : properties) { // property
-		if (propInfo.props.getValue(property) != null) { // if
+		Object value = propInfo.props.getValue(property);
+		if (value != null && (!(value instanceof String) || !((String)value).equals(""))) { // if
 %>
 			props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>", 
 				<%=component.getCodegenValue(property, propInfo.props.getStringValue(property))%>);

main/plugins/org.talend.designer.codegen/pom.xml

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

main/plugins/org.talend.designer.components.exchange/pom.xml

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

main/plugins/org.talend.designer.components.libs/libs_src/talend-marketo-rest/pom.xml

@@ -15,7 +15,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<cxf.version>3.1.1</cxf.version>
-		<talend.nexus.url>http://newbuild.talend.com:8081</talend.nexus.url>
+		<talend.nexus.url>https://artifacts-zl.talend.com</talend.nexus.url>
 	</properties>
 	
 	<distributionManagement>

main/plugins/org.talend.designer.components.libs/pom.xml

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

main/plugins/org.talend.designer.components.localprovider/components/tMDMOutput/tMDMOutput_main.javajet

@@ -158,7 +158,7 @@
 	        	for (int i = 0; i < keysReturn.size(); i++){
 	            	Map<String,String> map = keysReturn.get(i);
 	              	%>
-	              	<%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds(<%=i %>);
+	              	<%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds().get(<%=i %>);
 	            <%
 	            }
 	       	}
@@ -228,7 +228,7 @@
 		          for (int i = 0; i < keysReturn.size(); i++){
 		            Map<String,String> map = keysReturn.get(i);
 		            %>
-		            <%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds(<%=i %>);
+		            <%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds().get(<%=i %>);
 		          <%
 		          }
 		        }
@@ -293,7 +293,7 @@
 		            for (int i = 0; i < keysReturn.size(); i++){
 		              Map<String,String> map = keysReturn.get(i);
 		              %>
-		              <%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds(<%=i %>);
+		              <%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds().get(<%=i %>);
 		            <%
 		            }
 		          }

main/plugins/org.talend.designer.components.localprovider/components/tMDMWriteConf/tMDMWriteConf_main.javajet

@@ -185,7 +185,7 @@ if (metadatas != null && metadatas.size()>0) {
 	        	for (int i = 0; i < keysReturn.size(); i++){
 	            	Map<String,String> map = keysReturn.get(i);
 	              	%>
-	              	<%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds(<%=i %>);
+	              	<%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds().get(<%=i %>);
 	            <%
 	            }
 	       	}
@@ -252,7 +252,7 @@ if (metadatas != null && metadatas.size()>0) {
 		          for (int i = 0; i < keysReturn.size(); i++){
 		            Map<String,String> map = keysReturn.get(i);
 		            %>
-		            <%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds(<%=i %>);
+		            <%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds().get(<%=i %>);
 		          <%
 		          }
 		        }
@@ -311,7 +311,7 @@ if (metadatas != null && metadatas.size()>0) {
 		            for (int i = 0; i < keysReturn.size(); i++){
 		              Map<String,String> map = keysReturn.get(i);
 		              %>
-		              <%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds(<%=i %>);
+		              <%=outConnName %>.<%=map.get("OUTPUT_COLUMN")%>= wspk_<%=cid%>.getIds().get(<%=i %>);
 		            <%
 		            }
 		          }

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftOutput/tRedshiftOutput_begin.javajet

@@ -42,6 +42,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 
 	String table = ElementParameterParser.getValue(node,"__TABLE__");//work for sub script. TODO : move it
 	String tableName = ElementParameterParser.getValue(node,"__TABLE__");
+	boolean tableNameWithSchema = "true".equals(ElementParameterParser.getValue(node, "__TABLE_WITH_SCHEMA__"));
 
 	String dbmsId = ElementParameterParser.getValue(node,"__MAPPING__");
 
@@ -107,13 +108,32 @@ if(("true").equals(useExistingConn)) {
 	<%
 }
 %>
-
-String tableName_<%=cid%> = null;
-if(dbschema_<%=cid%> == null || dbschema_<%=cid%>.trim().length() == 0) {
-	tableName_<%=cid%> = <%=tableName%>;
-} else {
-	tableName_<%=cid%> = dbschema_<%=cid%> + "\".\"" + <%=tableName%>;
+String tableName_<%=cid%> = <%=tableName%>;
+String schemaForSearch_<%=cid%> = null;
+String tableForSearch_<%=cid%> = tableName_<%=cid%>;
+<%
+if(tableNameWithSchema){
+%>
+    if(tableName_<%=cid%>!=null && tableName_<%=cid%>.trim().length()>0){
+    	tableName_<%=cid%> = tableName_<%=cid%>.replace("\".\"",".");
+    	String[] names_<%=cid%> = tableName_<%=cid%>.split("\\.");
+    	if(names_<%=cid%>.length > 0){
+    		tableForSearch_<%=cid%> = names_<%=cid%>[names_<%=cid%>.length-1];
+    	}
+    	if(names_<%=cid%>.length > 1){
+    		schemaForSearch_<%=cid%> = names_<%=cid%>[names_<%=cid%>.length-2];
+    	}
+    	tableName_<%=cid%> = tableName_<%=cid%>.replace(".","\".\"");
+    }
+<%
+}else{
+%>
+    if(dbschema_<%=cid%> != null && dbschema_<%=cid%>.trim().length() > 0) {
+    	tableName_<%=cid%> = dbschema_<%=cid%> + "\".\"" + tableName_<%=cid%>;
+    }
+<%
 }
+%>
 
 <%
 if(("UPDATE").equals(dataAction) || ("INSERT_OR_UPDATE").equals(dataAction) || ("UPDATE_OR_INSERT").equals(dataAction)) {

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftOutput/tRedshiftOutput_java.xml

@@ -334,6 +334,14 @@
       >
       <DEFAULT>10000</DEFAULT>
     </PARAMETER>
+    
+    <PARAMETER
+    	NAME="TABLE_WITH_SCHEMA"
+    	FIELD="CHECK"
+    	NUM_ROW="40"
+    >
+    	<DEFAULT>false</DEFAULT>
+    </PARAMETER>
 
   </ADVANCED_PARAMETERS>
 

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftOutput/tRedshiftOutput_messages.properties

@@ -87,3 +87,5 @@ NB_LINE_REJECTED.NAME=Number Of Rejected Lines
 
 USE_BATCH.NAME=Use Batch
 BATCH_SIZE.NAME= Batch Size
+
+TABLE_WITH_SCHEMA.NAME=Table name include schema

main/plugins/org.talend.designer.components.localprovider/components/tSalesforceGetDeleted/tSalesforceGetDeleted_java.xml

@@ -70,7 +70,7 @@
 		REQUIRED="true"
         SHOW_IF="USE_EXISTING_CONNECTION == 'false'"
         GROUP="LOGIN">
-        <DEFAULT IF="LOGIN_TYPE == 'BASIC'">"https://login.salesforce.com/services/Soap/u/25.0"</DEFAULT>
+        <DEFAULT IF="LOGIN_TYPE == 'BASIC'">"https://login.salesforce.com/services/Soap/u/34.0"</DEFAULT>
         <DEFAULT IF="LOGIN_TYPE == 'OAUTH'">"https://login.salesforce.com/services/oauth2"</DEFAULT>
 	</PARAMETER>
 
@@ -81,7 +81,7 @@
         REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (LOGIN_TYPE == 'OAUTH')"
         SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (LOGIN_TYPE == 'OAUTH')"
         GROUP="LOGIN">
-        <DEFAULT>"25.0"</DEFAULT>
+        <DEFAULT>"34.0"</DEFAULT>
     </PARAMETER>
 
     <PARAMETER

main/plugins/org.talend.designer.components.localprovider/components/tSalesforceGetServerTimestamp/tSalesforceGetServerTimestamp_java.xml

@@ -72,7 +72,7 @@
       REQUIRED="true"
       SHOW_IF="USE_EXISTING_CONNECTION == 'false'"
       GROUP="LOGIN">
-      <DEFAULT IF="LOGIN_TYPE == 'BASIC'">"https://login.salesforce.com/services/Soap/u/25.0"</DEFAULT>
+      <DEFAULT IF="LOGIN_TYPE == 'BASIC'">"https://login.salesforce.com/services/Soap/u/34.0"</DEFAULT>
       <DEFAULT IF="LOGIN_TYPE == 'OAUTH'">"https://login.salesforce.com/services/oauth2"</DEFAULT>
     </PARAMETER>
 
@@ -83,7 +83,7 @@
         REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (LOGIN_TYPE == 'OAUTH')"
         SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (LOGIN_TYPE == 'OAUTH')"
         GROUP="LOGIN">
-        <DEFAULT>"25.0"</DEFAULT>
+        <DEFAULT>"34.0"</DEFAULT>
     </PARAMETER>
 
     <PARAMETER

main/plugins/org.talend.designer.components.localprovider/components/tSalesforceGetUpdated/tSalesforceGetUpdated_java.xml

@@ -70,7 +70,7 @@
         REQUIRED="true"
         SHOW_IF="USE_EXISTING_CONNECTION == 'false'"
         GROUP="LOGIN">
-        <DEFAULT IF="LOGIN_TYPE == 'BASIC'">"https://login.salesforce.com/services/Soap/u/25.0"</DEFAULT>
+        <DEFAULT IF="LOGIN_TYPE == 'BASIC'">"https://login.salesforce.com/services/Soap/u/34.0"</DEFAULT>
         <DEFAULT IF="LOGIN_TYPE == 'OAUTH'">"https://login.salesforce.com/services/oauth2"</DEFAULT>
     </PARAMETER>
     <PARAMETER
@@ -80,7 +80,7 @@
         REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (LOGIN_TYPE == 'OAUTH')"
         SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (LOGIN_TYPE == 'OAUTH')"
         GROUP="LOGIN">
-        <DEFAULT>"25.0"</DEFAULT>
+        <DEFAULT>"34.0"</DEFAULT>
     </PARAMETER>
     <PARAMETER
       NAME="USER"

main/plugins/org.talend.designer.components.localprovider/components/tSalesforceInput/tSalesforceInput_java.xml

@@ -81,7 +81,7 @@
             REPOSITORY_VALUE="ENDPOINT"
             SHOW_IF="USE_EXISTING_CONNECTION == 'false'"
             GROUP="LOGIN">
-			<DEFAULT IF="LOGIN_TYPE == 'BASIC'">"https://login.salesforce.com/services/Soap/u/25.0"</DEFAULT>
+			<DEFAULT IF="LOGIN_TYPE == 'BASIC'">"https://login.salesforce.com/services/Soap/u/34.0"</DEFAULT>
             <DEFAULT IF="LOGIN_TYPE == 'OAUTH'">"https://login.salesforce.com/services/oauth2"</DEFAULT>
 		</PARAMETER>
 
@@ -93,7 +93,7 @@
             SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND ((LOGIN_TYPE == 'OAUTH') OR (API == 'bulk'))"
             REPOSITORY_VALUE="API_VERSION"
             GROUP="LOGIN">
-            <DEFAULT>"25.0"</DEFAULT>
+            <DEFAULT>"34.0"</DEFAULT>
         </PARAMETER>
 
 		<PARAMETER
@@ -2637,7 +2637,7 @@
 	<CODEGENERATION>
 		<IMPORTS>
 			<IMPORT NAME="salesforceCRM-management"
-				MODULE="salesforceCRMManagement.jar" MVN="mvn:org.talend.libraries/salesforceCRMManagement/6.0.1"  UrlPath="platform:/plugin/org.talend.libraries.salesforce/lib/salesforceCRMManagement.jar" REQUIRED_IF="API=='soap'"/>
+				MODULE="salesforceCRMManagement.jar" MVN="mvn:org.talend.libraries/salesforceCRMManagement/6.1.0"  UrlPath="platform:/plugin/org.talend.libraries.salesforce/lib/salesforceCRMManagement.jar" REQUIRED_IF="API=='soap'"/>
 			<IMPORT NAME="axiom-api"
 				MODULE="axiom-api-1.2.13.jar" MVN="mvn:org.talend.libraries/axiom-api-1.2.13/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/axiom-api-1.2.13.jar" REQUIRED_IF="API=='soap'" />
 			<IMPORT NAME="axiom-impl" MODULE="axiom-impl-1.2.13.jar" MVN="mvn:org.talend.libraries/axiom-impl-1.2.13/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/axiom-impl-1.2.13.jar" REQUIRED_IF="API=='soap'" />
@@ -2673,9 +2673,9 @@
 				REQUIRED_IF="API=='soap'" />
 
 			<IMPORT NAME="salesforceBulkAPI"
-				MODULE="salesforceBulkAPI.jar" MVN="mvn:org.talend.libraries/salesforceBulkAPI/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.salesforce/lib/salesforceBulkAPI.jar" REQUIRED_IF="API=='bulk'" />
-			<IMPORT NAME="partner" MODULE="partnerBulk.jar" MVN="mvn:org.talend.libraries/partnerBulk/6.0.0"  REQUIRED_IF="API=='bulk'"/>
-			<IMPORT NAME="wsc" MODULE="wsc.jar" MVN="mvn:org.talend.libraries/wsc/6.0.0"
+				MODULE="salesforceBulkAPI.jar" MVN="mvn:org.talend.libraries/salesforceBulkAPI/6.1.0"  UrlPath="platform:/plugin/org.talend.libraries.salesforce/lib/salesforceBulkAPI.jar" REQUIRED_IF="API=='bulk'" />
+			<IMPORT NAME="partner" MODULE="partnerBulk-34.jar" MVN="mvn:org.talend.libraries/partnerBulk-34/6.1.0"  REQUIRED_IF="API=='bulk'"/>
+			<IMPORT NAME="force-wsc-33.0.0.jar" MODULE="force-wsc-33.0.0.jar" MVN="mvn:org.talend.libraries/force-wsc-33.0.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.salesforce/lib/force-wsc-33.0.0.jar"
 				REQUIRED_IF="API=='bulk'"/>
 			<IMPORT NAME="CsvWriter" MODULE="talendcsv.jar" MVN="mvn:org.talend.libraries/talendcsv/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.csv/lib/talendcsv.jar" REQUIRED_IF="API=='bulk'"/>
 

main/plugins/org.talend.designer.components.localprovider/components/tSalesforceOutputBulkExec/tSalesforceOutputBulkExec_java.xml

@@ -81,7 +81,7 @@
             REQUIRED="true" 
             SHOW_IF="USE_EXISTING_CONNECTION == 'false'"
             GROUP="LOGIN">
-            <DEFAULT IF="LOGIN_TYPE=='BASIC'">"https://login.salesforce.com/services/Soap/u/25.0"</DEFAULT>
+            <DEFAULT IF="LOGIN_TYPE=='BASIC'">"https://login.salesforce.com/services/Soap/u/34.0"</DEFAULT>
             <DEFAULT IF="LOGIN_TYPE=='OAUTH'">"https://login.salesforce.com/services/oauth2"</DEFAULT>
         </PARAMETER>
 		<PARAMETER 
@@ -111,7 +111,7 @@
             REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"  
             SHOW_IF="(USE_EXISTING_CONNECTION == 'false')"
             GROUP="LOGIN">
-            <DEFAULT>"25.0"</DEFAULT>
+            <DEFAULT>"34.0"</DEFAULT>
         </PARAMETER>
         <PARAMETER 
             NAME="OAUTH_CLIENT_ID" 

main/plugins/org.talend.designer.components.localprovider/components/tSendMail/tSendMail_java.xml

@@ -206,8 +206,8 @@
 
   <CODEGENERATION>
     <IMPORTS>
-      <IMPORT NAME="JavaMail" MODULE="mail-1.4.jar" MVN="mvn:org.talend.libraries/mail-1.4/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/mail-1.4.jar" REQUIRED="true" />
-      <IMPORT NAME="JAF" MODULE="activation.jar" MVN="mvn:org.talend.libraries/activation/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/activation.jar" REQUIRED="true" />
+      <IMPORT NAME="JavaMail" MODULE="mail-1.4.jar" MVN="mvn:org.talend.libraries/mail-1.4/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/mail-1.4.jar" REQUIRED="true" BundleID="" />
+      <IMPORT NAME="JAF" MODULE="activation.jar" MVN="mvn:org.talend.libraries/activation/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/activation.jar" REQUIRED="true" BundleID="" />
   </IMPORTS>
   </CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/templates/_tableActionForOutput.javajet

@@ -237,6 +237,19 @@ if (!isParallelize) {
 									whetherExist_<%=cid%> = true;
 								}
 				                rsTable_<%=cid%>.close();
+				            <%
+                            } else if(REDSHIFT.equalsIgnoreCase(dbmsId)) {
+                            %>
+				                java.sql.DatabaseMetaData dbMetaData_<%=cid%> = conn_<%=cid%>.getMetaData();
+                                java.sql.ResultSet rsTable_<%=cid%> = dbMetaData_<%=cid%>.getTables(null, schemaForSearch_<%=cid%>, null, new String[]{"TABLE"});
+                                boolean whetherExist_<%=cid%> = false;
+                                while(rsTable_<%=cid%>.next()) {
+                                    if(rsTable_<%=cid%>.getString("TABLE_NAME").equalsIgnoreCase(tableForSearch_<%=cid%>)) {
+                                        whetherExist_<%=cid%> = true;
+                                        break;
+                                    }
+                                }
+                                rsTable_<%=cid%>.close();
                             <%
                             } else {
                             %>

main/plugins/org.talend.designer.components.localprovider/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.1.1-SNAPSHOT</version>
+    <version>6.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.localprovider</artifactId>
@@ -55,7 +55,7 @@
                             <artifactItem>
                                 <groupId>org.talend.mdm</groupId>
                                 <artifactId>org.talend.mdm.bulkload.client</artifactId>
-                                <version>6.1.1-SNAPSHOT</version>
+                                <version>6.1.1</version>
                                 <type>zip</type>
                                 <overWrite>true</overWrite>
                                 <outputDirectory>${bulkload.dir}</outputDirectory>
@@ -99,7 +99,7 @@
                             <fileset dir="${bulkload.dir}" includes="org.talend.mdm.bulkload.client*.jar" id="bulkloadpath_temp" />
                             <pathconvert property="bulkloadpath" refid="bulkloadpath_temp" />	
                             <echo>bulkloadpath=${bulkloadpath}</echo>
-                            <move file="${bulkloadpath}" tofile="${bulkload.dir}/bulkloadclient.jar"/>
+                            <move file="${bulkloadpath}" tofile="${bulkload.dir}/bulkloadclient.jar" />
                         </target>
                     </configuration>
                     <goals>

main/plugins/org.talend.designer.core/pom.xml

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

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/model/components/EParameterName.java

@@ -86,6 +86,8 @@ public enum EParameterName {
     COMP_DEFAULT_FILE_DIR("COMP_DEFAULT_FILE_DIR"), //$NON-NLS-1$  Hidden parameter so no translation needed
     PRODUCT_ROOT_DIR("PRODUCT_ROOT_DIR"), //$NON-NLS-1$  for TDQ_INSTALL_DIR
     COMP_DEFAULT_PROJECT_DIR("COMP_DEFAULT_PROJECT_DIR"), //$NON-NLS-1$  Hidden parameter so no translation needed
+    // For TDQ-11338 Add this path for tDqReportRun component on git remote project
+    TDQ_DEFAULT_PROJECT_DIR("TDQ_DEFAULT_PROJECT_DIR"), //$NON-NLS-1$  Hidden parameter so no translation needed
     DQ_REPORTING_BUNDLE_DIR("DQ_REPORTING_BUNDLE_DIR"), //$NON-NLS-1$  Hidden parameter so no translation needed
     LOG4J_RUN_ACTIVATE("LOG4J_RUN_ACTIVATE"), //$NON-NLS-1$  Hidden parameter so no translation needed
     LOG4J_RUN_LEVEL("LOG4J_RUN_LEVEL"), //$NON-NLS-1$  Hidden parameter so no translation needed

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/model/process/jobsettings/JobSettingsManager.java

@@ -46,7 +46,6 @@ import org.talend.core.model.process.IProcess;
 import org.talend.core.model.utils.ContextParameterUtils;
 import org.talend.core.model.utils.TalendTextUtils;
 import org.talend.core.prefs.ITalendCorePrefConstants;
-import org.talend.core.repository.ui.view.RepositoryLabelProvider;
 import org.talend.core.ui.component.ComponentsFactoryProvider;
 import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.designer.core.DesignerPlugin;
@@ -279,7 +278,7 @@ public class JobSettingsManager {
             // zywang added to fix feature 5545
             param = new ElementParameter(process);
             param.setName(EParameterName.ICONSELECTION.getName());
-            param.setValue(RepositoryLabelProvider.getDefaultJobletImage()); //$NON-NLS-1$
+            param.setValue(""); //$NON-NLS-1$
             param.setDisplayName(EParameterName.ICONSELECTION.getDisplayName());
             param.setFieldType(EParameterFieldType.ICON_SELECTION);
             param.setCategory(EComponentCategory.EXTRA);

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/TalendGridLayer.java

@@ -19,6 +19,7 @@ import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gef.editparts.GridLayer;
 import org.eclipse.swt.graphics.Color;
+import org.talend.commons.ui.gmf.draw2d.AnimatableZoomManager;
 import org.talend.commons.ui.runtime.image.EImage;
 import org.talend.commons.ui.runtime.image.ImageProvider;
 
@@ -43,11 +44,12 @@ public class TalendGridLayer extends GridLayer {
     }
 
     protected void paintGrid(Graphics g, IFigure f, org.eclipse.draw2d.geometry.Point origin, int distanceX, int distanceY) {
-        FreeformFigure ff = (FreeformFigure) this.getParent();
-        Rectangle clientArea = getClientArea();
-        Rectangle bounds = ff.getFreeformExtent().getCopy();
-        bounds.union(clientArea.x, clientArea.y, clientArea.width, clientArea.height);
-        ff.setFreeformBounds(bounds);
+    	 FreeformFigure ff = (FreeformFigure) this.getParent();
+    	 Rectangle clientArea = getClientArea();
+    	 Rectangle bounds = ff.getFreeformExtent().getCopy();
+    	 bounds.union(clientArea.x, clientArea.y, clientArea.width * AnimatableZoomManager.currentZoom, clientArea.height
+    	                 * AnimatableZoomManager.currentZoom);
+    	 ff.setFreeformBounds(bounds);
 
         Rectangle original = g.getClip(Rectangle.SINGLETON);
 

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/connections/ConnectionFigure.java

@@ -18,9 +18,11 @@ import java.util.Map;
 import java.util.Set;
 
 import org.eclipse.draw2d.Graphics;
+import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.PolygonDecoration;
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.draw2d.geometry.PointList;
+import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.draw2d.geometry.Translatable;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
 import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
@@ -390,5 +392,23 @@ public class ConnectionFigure extends PolylineConnectionEx implements IMapMode {
             super.setLineWidth(2);
         }
     }
+    
+    @Override
+    public Rectangle getBounds() {
+        if (bounds == null) {
+                int expand = (int) (getLineWidthFloat() / 2.0f);
+                bounds = getPoints().getBounds().getExpanded(expand, expand);
+            for (int i = 0; i < getChildren().size(); i++) {
+                IFigure child = (IFigure) getChildren().get(i);
+                bounds.union(child.getBounds());
+            }
+        }
+        return bounds;
+    }
+
+    @Override
+    public boolean containsPoint(int x, int y) {
+        return this.getBounds().contains(x,y);
+    }
 
 }

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/process/Process.java

@@ -68,6 +68,7 @@ import org.talend.commons.ui.runtime.image.ImageUtils;
 import org.talend.commons.utils.VersionUtils;
 import org.talend.core.CorePlugin;
 import org.talend.core.GlobalServiceRegister;
+import org.talend.core.ITDQRepositoryService;
 import org.talend.core.PluginChecker;
 import org.talend.core.language.ECodeLanguage;
 import org.talend.core.language.LanguageManager;
@@ -170,6 +171,7 @@ import org.talend.designer.core.utils.JobSettingVersionUtil;
 import org.talend.designer.core.utils.ValidationRulesUtil;
 import org.talend.designer.runprocess.IRunProcessService;
 import org.talend.designer.runprocess.ItemCacheManager;
+import org.talend.model.bridge.ReponsitoryContextBridge;
 import org.talend.repository.ProjectManager;
 import org.talend.repository.constants.Log4jPrefsConstants;
 import org.talend.repository.model.IProxyRepositoryFactory;
@@ -373,6 +375,20 @@ public class Process extends Element implements IProcess2, IGEFProcess, ILastVer
                 .getString(TalendDesignerPrefConstants.COMP_DEFAULT_FILE_DIR));
         param.setReadOnly(true);
         addElementParameter(param);
+        // For TDQ-11338 Add this path for tDqReportRun component on git remote project
+
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQRepositoryService.class)) {
+            param = new ElementParameter(this);
+            param.setName(EParameterName.TDQ_DEFAULT_PROJECT_DIR.getName());
+            param.setCategory(EComponentCategory.TECHNICAL);
+            param.setFieldType(EParameterFieldType.DIRECTORY);
+            param.setDisplayName(EParameterName.TDQ_DEFAULT_PROJECT_DIR.getDisplayName());
+            param.setNumRow(99);
+            param.setShow(false);
+            param.setValue(ReponsitoryContextBridge.getRootProject().getLocation().toPortableString());
+            param.setReadOnly(true);
+            addElementParameter(param);
+        }
 
         // for log4j activate
         param = new ElementParameter(this);
@@ -1207,12 +1223,8 @@ public class Process extends Element implements IProcess2, IGEFProcess, ILastVer
                                         continue;
                                     }
                                     comp.initParamPropertiesFromSerialized(param, pTypeValue);
-                                    String value = null;
-                                    Object obj = comp.genericFromSerialized(pTypeValue, param.getName());
-                                    if (obj != null) {
-                                        value = obj.toString();
-                                    }
-                                    loadElementParameters(elemParam, pType, param, param.getName(), value, false);
+                                    Object object = comp.genericFromSerialized(pTypeValue, param.getName());
+                                    loadElementParameters(elemParam, pType, param, param.getName(), object, false);
                                 }
                             }
                         }
@@ -1279,13 +1291,17 @@ public class Process extends Element implements IProcess2, IGEFProcess, ILastVer
     }
 
     private void loadElementParameters(Element elemParam, ElementParameterType pType, IElementParameter param, String key,
-            String value, boolean isJunitLoad) {
+            Object object, boolean isJunitLoad) {
         if (param != null) {
             if (pType.isSetContextMode()) {
                 param.setContextMode(pType.isContextMode());
             } else {
                 param.setContextMode(false);
             }
+            String value = null;
+            if (object != null) {
+                value = object.toString();
+            }
             if (param.getFieldType().equals(EParameterFieldType.CHECK) || param.getFieldType().equals(EParameterFieldType.RADIO)) {
                 if ("false".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value) || !pType.isContextMode()) { //$NON-NLS-1$ //$NON-NLS-2$
                     Boolean boolean1 = new Boolean(value);
@@ -1417,6 +1433,8 @@ public class Process extends Element implements IProcess2, IGEFProcess, ILastVer
                 } else {
                     elemParam.setPropertyValue(key, value);
                 }
+            } else if (param.getFieldType().equals(EParameterFieldType.SCHEMA_TYPE)) {
+                elemParam.setPropertyValue(key, object);
             }
         } else if (UpdateTheJobsActionsOnTable.isClear && "CLEAR_TABLE".equals(key) //$NON-NLS-1$
                 && "true".equals(pType.getValue()) //$NON-NLS-1$

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/properties/ConfigureConnParamDialog.java

@@ -43,6 +43,7 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.talend.commons.ui.utils.PathUtils;
+import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
 import org.talend.core.model.param.EConnectionParameterName;
 import org.talend.core.model.process.IContext;
 import org.talend.core.model.process.IContextManager;
@@ -52,6 +53,7 @@ import org.talend.core.model.utils.ContextParameterUtils;
 import org.talend.core.model.utils.PathExtractor;
 import org.talend.core.sqlbuilder.util.ConnectionParameters;
 import org.talend.designer.core.i18n.Messages;
+import org.talend.designer.core.ui.editor.connections.TracesConnectionUtils;
 import org.talend.designer.core.ui.editor.properties.controllers.AbstractElementPropertySectionController;
 
 /**
@@ -472,9 +474,12 @@ public class ConfigureConnParamDialog extends Dialog {
         GridData data = new GridData(GridData.FILL_HORIZONTAL);
         // GridDataFactory.swtDefaults().hint(LABEL_DEFAULT_X, DEFAULT_HEIGHT).applyTo(hostLabel);
         hostLabel.setLayoutData(data);
-
-        final Text host = new Text(hostComposite, SWT.BORDER);
-
+        boolean isContext = ContextParameterUtils.isContainContextParam(pvValues.get(key));
+        int passStyle = SWT.BORDER;
+        if((key == EConnectionParameterName.PASSWORD)&&!isContext){
+            passStyle = SWT.PASSWORD; 
+        }
+        final Text host = new Text(hostComposite, passStyle);
         host.setText(pvValues.get(key));
         if (host.getText().trim().length() == 0) {
             host.setBackground(ColorConstants.red);
@@ -483,12 +488,31 @@ public class ConfigureConnParamDialog extends Dialog {
         // GridDataFactory.swtDefaults().hint(TEXT_DEFAULT_X, DEFAULT_HEIGHT).applyTo(host);
         gridData = new GridData(GridData.FILL_HORIZONTAL);
         host.setLayoutData(gridData);
-        final Text hostText = new Text(hostComposite, SWT.NONE);
+        
+        Composite contextComposite = new Composite(hostComposite, SWT.NULL);
+        GridLayout naviCommonCompLayout = new GridLayout(2, false);
+        naviCommonCompLayout.marginWidth = 0;
+        naviCommonCompLayout.marginHeight = 0;
+        contextComposite.setLayout(naviCommonCompLayout);
+        contextComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+        contextComposite.setVisible(isContext);
+        
+        final Text hostText = new Text(contextComposite, SWT.NONE);
         hostText.setEditable(false);
-        gridData = new GridData(GridData.FILL_HORIZONTAL);
+        gridData = new GridData();
         hostText.setLayoutData(gridData);
-        hostText.setText(CONTEXT_WITH + ContextParameterUtils.parseScriptContextCode(host.getText(), defaultContext));
-        host.setData(TEXT_CONTROL, hostText);
+        hostText.setText(CONTEXT_WITH);
+        
+        passStyle = SWT.NONE;
+        if(key == EConnectionParameterName.PASSWORD){
+            passStyle = SWT.PASSWORD; 
+        }
+        final Text hostValue = new Text(contextComposite, passStyle);
+        hostValue.setEditable(false);
+        gridData = new GridData(GridData.FILL_HORIZONTAL);
+        hostValue.setLayoutData(gridData);
+        hostValue.setText(ContextParameterUtils.parseScriptContextCode(host.getText(), defaultContext));
+        host.setData(TEXT_CONTROL, hostValue);
         host.setData(key);
         allParamText.add(host);
         host.addKeyListener(new KeyAdapter() {
@@ -508,7 +532,7 @@ public class ConfigureConnParamDialog extends Dialog {
                         host.setBackground(ColorConstants.white);
                         host.redraw();
                     }
-                    resetValues(host, hostText);
+                    resetValues(host, hostValue);
                 }
             }
 
@@ -614,7 +638,7 @@ public class ConfigureConnParamDialog extends Dialog {
      */
     private void resetValues(final Text key, final Text value) {
         final IContext context = contextManager.getContext(contextCombo.getItem(contextCombo.getSelectionIndex()));
-        value.setText(CONTEXT_WITH + ContextParameterUtils.parseScriptContextCode(key.getText(), context));
+        value.setText(ContextParameterUtils.parseScriptContextCode(key.getText(), context));
     }
 
 }

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/update/UpdateManagerUtils.java

@@ -34,6 +34,7 @@ import org.talend.commons.runtime.model.repository.ERepositoryStatus;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.ui.swt.dialogs.ProgressDialog;
 import org.talend.core.CorePlugin;
+import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.context.JobContext;
 import org.talend.core.model.metadata.IMetadataTable;
@@ -54,6 +55,7 @@ import org.talend.core.model.update.UpdatesConstants;
 import org.talend.core.model.update.extension.UpdateManagerProviderDetector;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.ui.CoreUIPlugin;
+import org.talend.core.ui.ITestContainerProviderService;
 import org.talend.core.ui.component.ComponentPaletteUtilities;
 import org.talend.core.ui.context.view.AbstractContextView;
 import org.talend.core.ui.context.view.Contexts;
@@ -384,13 +386,24 @@ public final class UpdateManagerUtils {
                                     result.setJob(null);
                                 }
                             }
+                            boolean isTestContainer = false;
+                            ITestContainerProviderService testContainerService = null;
+                            if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
+                                testContainerService = (ITestContainerProviderService) GlobalServiceRegister
+                                        .getDefault().getService(ITestContainerProviderService.class);
+                                if (testContainerService != null ) {
+                                    isTestContainer = testContainerService.isTestContainerItem(item);
+                                }
+                            }
 
                             if (closedItem && process instanceof IProcess2) {
                                 IProcess2 process2 = (IProcess2) process;
                                 ProcessType processType;
                                 try {
                                     processType = process2.saveXmlFile(false);
-                                    if (item instanceof JobletProcessItem) {
+                                    if(isTestContainer){
+                                        testContainerService.setTestContainerProcess(processType,item);
+                                    }else if (item instanceof JobletProcessItem) {
                                         ((JobletProcessItem) item).setJobletProcess((JobletProcess) processType);
                                     } else {
                                         ((ProcessItem) item).setProcess(processType);

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/update/cmd/UpdateNodeParameterCommand.java

@@ -82,9 +82,11 @@ import org.talend.designer.core.model.components.EmfComponent;
 import org.talend.designer.core.ui.editor.cmd.ChangeMetadataCommand;
 import org.talend.designer.core.ui.editor.cmd.PropertyChangeCommand;
 import org.talend.designer.core.ui.editor.nodes.Node;
+import org.talend.designer.core.ui.editor.process.Process;
 import org.talend.designer.core.ui.editor.update.UpdateManagerUtils;
 import org.talend.designer.core.utils.SAPParametersUtils;
 import org.talend.metadata.managment.ui.model.ProjectNodeHelper;
+import org.talend.metadata.managment.ui.utils.ConnectionContextHelper;
 import org.talend.repository.UpdateRepositoryUtils;
 
 /**
@@ -276,6 +278,9 @@ public class UpdateNodeParameterCommand extends Command {
                                     .equals(connectionItem.getProperty().getId())) {
                         curPropertyParam = param;
                         parentParamName = curPropertyParam.getName();
+                        if(connectionItem!=null){
+                            ConnectionContextHelper.addContextForNodeParameter(node, connectionItem, false);
+                        }
                         break;
                     }
                 }

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/preferences/PreferenceInitializer.java

@@ -164,6 +164,9 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
             store.setDefault(ITalendCorePrefConstants.AUTO_REFRESH_LOCKS, true);
         }
 
+        store.setDefault(ITalendCorePrefConstants.NEXUS_TIMEOUT, 10000);
+        store.setDefault(ITalendCorePrefConstants.NEXUS_REFRESH_FREQUENCY, 0);
+
         if (!CommonUIPlugin.isFullyHeadless()) {
             Display display = Display.getDefault();
             if (display == null) {

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/views/jobsettings/tabs/MainComposite.java

@@ -53,6 +53,7 @@ import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection;
 import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
 import org.talend.commons.exception.CommonExceptionHandler;
+import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.LoginException;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
@@ -80,6 +81,7 @@ import org.talend.core.ui.editor.JobEditorHandlerManager;
 import org.talend.core.utils.KeywordsValidator;
 import org.talend.designer.core.i18n.Messages;
 import org.talend.repository.ProjectManager;
+import org.talend.repository.RepositoryWorkUnit;
 import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.repository.model.RepositoryConstants;
 import org.talend.repository.ui.properties.StatusHelper;
@@ -594,66 +596,81 @@ public class MainComposite extends AbstractTabComposite {
                             // Convert
                             final Item newItem = ConvertJobsUtil.createOperation(originalName, originalJobType,
                                     originalFramework, repositoryObject);
-                            IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
+                            RepositoryWorkUnit repositoryWorkUnit = new RepositoryWorkUnit("Convert job") { //$NON-NLS-1$
 
                                 @Override
-                                public void run(final IProgressMonitor monitor) throws CoreException {
-                                    try {
-                                        boolean isOpened = false;
-                                        if (repositoryObject instanceof IProcess2) {
-                                            isOpened = true;
-                                            boolean locked = proxyRepositoryFactory.getStatus(repositoryObject) == ERepositoryStatus.LOCK_BY_USER;
-                                            if (locked) {
-                                                proxyRepositoryFactory.unlock(repositoryObject);
-                                            }
-                                        }
+                                public void run() throws PersistenceException {
+                                    IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
 
-                                        boolean isNewItemCreated = true;
-                                        Property repositoryProperty = repositoryObject.getProperty();
-                                        if (repositoryProperty != null) {
-                                            isNewItemCreated = (repositoryProperty.getItem() != newItem);
-                                        }
-                                        if (isNewItemCreated) {
-                                            // new Item created
-                                            proxyRepositoryFactory.deleteObjectPhysical(repositoryObject);
-                                            proxyRepositoryFactory.saveProject(ProjectManager.getInstance().getCurrentProject());
-                                        }
-                                        if (newItem != null && newItem.getProperty() != null) {
-                                            String newId = newItem.getProperty().getId();
-                                            if (isNewItemCreated) {
-                                                newRepositoryObject = proxyRepositoryFactory.getLastVersion(ProjectManager
-                                                        .getInstance().getCurrentProject(), newId);
-                                            } else {
-                                                newRepositoryObject = repositoryObject;
-                                            }
-                                            if (!isOpened) {
-                                                repositoryObject = newRepositoryObject;
-                                                if (!jobTypeCCombo.isDisposed() && !jobFrameworkCCombo.isDisposed()) {
-                                                    jobTypeValue = jobTypeCCombo.getText();
-                                                    frameworkValue = jobFrameworkCCombo.getText();
+                                        @Override
+                                        public void run(final IProgressMonitor monitor) throws CoreException {
+                                            try {
+                                                boolean isOpened = false;
+                                                if (repositoryObject instanceof IProcess2) {
+                                                    isOpened = true;
+                                                    boolean locked = proxyRepositoryFactory.getStatus(repositoryObject) == ERepositoryStatus.LOCK_BY_USER;
+                                                    if (locked) {
+                                                        proxyRepositoryFactory.unlock(repositoryObject);
+                                                    }
                                                 }
+
+                                                boolean isNewItemCreated = true;
+                                                Property repositoryProperty = repositoryObject.getProperty();
+                                                if (repositoryProperty != null) {
+                                                    isNewItemCreated = (repositoryProperty.getItem() != newItem);
+                                                }
+                                                if (isNewItemCreated) {
+                                                    // new Item created
+                                                    proxyRepositoryFactory.deleteObjectPhysical(repositoryObject);
+                                                    proxyRepositoryFactory.saveProject(ProjectManager.getInstance()
+                                                            .getCurrentProject());
+                                                } else if (repositoryObject.getProperty() != null) {
+                                                    proxyRepositoryFactory.save(ProjectManager.getInstance().getCurrentProject(),
+                                                            repositoryObject.getProperty().getItem(), false);
+                                                }
+                                                if (newItem != null && newItem.getProperty() != null) {
+                                                    String newId = newItem.getProperty().getId();
+                                                    if (isNewItemCreated) {
+                                                        newRepositoryObject = proxyRepositoryFactory.getLastVersion(
+                                                                ProjectManager.getInstance().getCurrentProject(), newId);
+                                                    } else {
+                                                        newRepositoryObject = repositoryObject;
+                                                    }
+                                                    if (!isOpened) {
+                                                        repositoryObject = newRepositoryObject;
+                                                        if (!jobTypeCCombo.isDisposed() && !jobFrameworkCCombo.isDisposed()) {
+                                                            jobTypeValue = jobTypeCCombo.getText();
+                                                            frameworkValue = jobFrameworkCCombo.getText();
+                                                        }
+                                                    }
+                                                }
+
+                                            } catch (PersistenceException e1) {
+                                                e1.printStackTrace();
+                                            } catch (LoginException e) {
+                                                e.printStackTrace();
                                             }
                                         }
-                                    } catch (PersistenceException e1) {
-                                        e1.printStackTrace();
-                                    } catch (LoginException e) {
-                                        e.printStackTrace();
+                                    };
+                                    // unlockObject();
+                                    // alreadyEditedByUser = true; // to avoid 2 calls of unlock
+
+                                    IWorkspace workspace = ResourcesPlugin.getWorkspace();
+                                    try {
+                                        ISchedulingRule schedulingRule = workspace.getRoot();
+                                        // the update the project files need to be done in the workspace runnable to
+                                        // avoid all
+                                        // notification
+                                        // of changes before the end of the modifications.
+                                        workspace.run(runnable, schedulingRule, IWorkspace.AVOID_UPDATE, null);
+                                    } catch (CoreException e1) {
+                                        MessageBoxExceptionHandler.process(e1.getCause());
                                     }
                                 }
                             };
-                            // unlockObject();
-                            // alreadyEditedByUser = true; // to avoid 2 calls of unlock
-
-                            IWorkspace workspace = ResourcesPlugin.getWorkspace();
-                            try {
-                                ISchedulingRule schedulingRule = workspace.getRoot();
-                                // the update the project files need to be done in the workspace runnable to avoid all
-                                // notification
-                                // of changes before the end of the modifications.
-                                workspace.run(runnable, schedulingRule, IWorkspace.AVOID_UPDATE, null);
-                            } catch (CoreException e1) {
-                                MessageBoxExceptionHandler.process(e1.getCause());
-                            }
+                            repositoryWorkUnit.setAvoidSvnUpdate(true);
+                            repositoryWorkUnit.setAvoidUnloadResources(true);
+                            ProxyRepositoryFactory.getInstance().executeRepositoryWorkUnit(repositoryWorkUnit);
                             if (newItem != null && repositoryObject instanceof IProcess2) {
                                 if (newRepositoryObject != null && newRepositoryObject.getProperty() != null) {
                                     openEditorOperation(newRepositoryObject.getProperty().getItem());
@@ -671,33 +688,44 @@ public class MainComposite extends AbstractTabComposite {
                                 }
                                 property.getAdditionalProperties().put(ConvertJobsUtil.FRAMEWORK, originalFramework);
                             }
-                            IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
+                            RepositoryWorkUnit repositoryWorkUnit = new RepositoryWorkUnit("Convert job") { //$NON-NLS-1$
 
                                 @Override
-                                public void run(final IProgressMonitor monitor) throws CoreException {
-                                    try {
-                                        if (repositoryObject.getProperty() != null) {
-                                            proxyRepositoryFactory.save(ProjectManager.getInstance().getCurrentProject(),
-                                                    repositoryObject.getProperty().getItem(), false);
+                                public void run() throws PersistenceException {
+                                    IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
+
+                                        @Override
+                                        public void run(final IProgressMonitor monitor) throws CoreException {
+                                            try {
+                                                if (repositoryObject.getProperty() != null) {
+                                                    proxyRepositoryFactory.save(ProjectManager.getInstance().getCurrentProject(),
+                                                            repositoryObject.getProperty().getItem(), false);
+                                                }
+                                            } catch (PersistenceException e1) {
+                                                ExceptionHandler.process(e1);
+                                            }
                                         }
-                                    } catch (PersistenceException e1) {
-                                        e1.printStackTrace();
+                                    };
+                                    // unlockObject();
+                                    // alreadyEditedByUser = true; // to avoid 2 calls of unlock
+
+                                    IWorkspace workspace = ResourcesPlugin.getWorkspace();
+                                    try {
+                                        ISchedulingRule schedulingRule = workspace.getRoot();
+                                        // the update the project files need to be done in the workspace runnable to
+                                        // avoid all
+                                        // notification
+                                        // of changes before the end of the modifications.
+                                        workspace.run(runnable, schedulingRule, IWorkspace.AVOID_UPDATE, null);
+                                    } catch (CoreException e1) {
+                                        MessageBoxExceptionHandler.process(e1.getCause());
                                     }
                                 }
                             };
-                            // unlockObject();
-                            // alreadyEditedByUser = true; // to avoid 2 calls of unlock
+                            repositoryWorkUnit.setAvoidSvnUpdate(true);
+                            repositoryWorkUnit.setAvoidUnloadResources(true);
+                            ProxyRepositoryFactory.getInstance().executeRepositoryWorkUnit(repositoryWorkUnit);
 
-                            IWorkspace workspace = ResourcesPlugin.getWorkspace();
-                            try {
-                                ISchedulingRule schedulingRule = workspace.getRoot();
-                                // the update the project files need to be done in the workspace runnable to avoid all
-                                // notification
-                                // of changes before the end of the modifications.
-                                workspace.run(runnable, schedulingRule, IWorkspace.AVOID_UPDATE, null);
-                            } catch (CoreException e1) {
-                                MessageBoxExceptionHandler.process(e1.getCause());
-                            }
                             if (repositoryObject instanceof IProcess2) {
                                 openEditorOperation(property.getItem());
                             }

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/views/properties/composites/MissingSettingsMultiThreadDynamicComposite.java

@@ -107,6 +107,7 @@ public class MissingSettingsMultiThreadDynamicComposite extends TopMessagesMulti
                     public void widgetSelected(SelectionEvent e) {
                         if (!missModulesNeeded.isEmpty()) {
                             ModulesInstallerUtil.forceInstallModules(getShell(), component, missModulesNeeded);
+                            checkVisibleTopMessages();
                         }
                     }
 

main/plugins/org.talend.designer.dbmap/pom.xml

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

main/plugins/org.talend.designer.documentation/pom.xml

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

main/plugins/org.talend.designer.filemultischemas/pom.xml

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

main/plugins/org.talend.designer.fileoutputxml/pom.xml

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

main/plugins/org.talend.designer.gefabstractmap/pom.xml

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

main/plugins/org.talend.designer.hl7/pom.xml

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

main/plugins/org.talend.designer.mapper.advanced/pom.xml

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