TDI-36765: Datasource in DI jobs is always a singleton and violates the

DataSource approach
https://jira.talendforge.org/browse/TDI-36765

i18n/plugins/org.talend.componentdesigner.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Designer Plug-in Nl Fragment
 Bundle-SymbolicName: org.talend.componentdesigner.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.componentdesigner
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.componentdesigner.nl</artifactId>

i18n/plugins/org.talend.componentdesigner.rcp.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.componentdesigner.rcp.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.componentdesigner.rcp

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.componentdesigner.rcp.nl</artifactId>

i18n/plugins/org.talend.designer.abstractmap.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.abstractmap.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.designer.abstractmap

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.abstractmap.nl</artifactId>

i18n/plugins/org.talend.designer.alfrescooutput.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.alfrescooutput.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.designer.alfrescooutput

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.alfrescooutput.nl</artifactId>

i18n/plugins/org.talend.designer.business.diagram.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.business.diagram.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.designer.business.diagram
 Bundle-Localization: plugin

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.diagram.nl</artifactId>

i18n/plugins/org.talend.designer.codegen.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.designer.codegen Nl Fragment
 Bundle-SymbolicName: org.talend.designer.codegen.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.designer.codegen
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.codegen.nl</artifactId>

i18n/plugins/org.talend.designer.components.exchange.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.designer.components.exchange.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.designer.components.exchange

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.exchange.nl</artifactId>

i18n/plugins/org.talend.designer.core.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Designer Plug-in Nl Fragment
 Bundle-SymbolicName: org.talend.designer.core.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.designer.core
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.core.nl</artifactId>

i18n/plugins/org.talend.designer.dbmap.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.dbmap.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.designer.dbmap

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.dbmap.nl</artifactId>

i18n/plugins/org.talend.designer.documentation.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.designer.documentation.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.designer.documentation

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.documentation.nl</artifactId>

i18n/plugins/org.talend.designer.fileoutputxml.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.fileoutputxml.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.designer.fileoutputxml

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.fileoutputxml.nl</artifactId>

i18n/plugins/org.talend.designer.gefabstractmap.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.gefabstractmap.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.designer.gefabstractmap

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.gefabstractmap.nl</artifactId>

i18n/plugins/org.talend.designer.hl7.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.designer.hl7.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.designer.hl7

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.hl7.nl</artifactId>

i18n/plugins/org.talend.designer.mapper.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mapper component Plug-in Nl Fragment
 Bundle-SymbolicName: org.talend.designer.mapper.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.designer.mapper
 Bundle-Vendor: .Talend SA.

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.mapper.nl</artifactId>

i18n/plugins/org.talend.designer.maven.job.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Maven Job NL
 Bundle-SymbolicName: org.talend.designer.maven.job.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.designer.maven.job
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.maven.job.nl</artifactId>

i18n/plugins/org.talend.designer.rowgenerator.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Rowgenerator Nl Fragment
 Bundle-SymbolicName: org.talend.designer.rowgenerator.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.designer.rowgenerator
 Bundle-Vendor: .Talend SA.

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.rowgenerator.nl</artifactId>

i18n/plugins/org.talend.designer.runprocess.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.designer.runprocess.nl fragment
 Bundle-SymbolicName: org.talend.designer.runprocess.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.designer.runprocess
 Bundle-Localization: plugin

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.runprocess.nl</artifactId>

i18n/plugins/org.talend.designer.scd.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.scd.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.designer.scd

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.scd.nl</artifactId>

i18n/plugins/org.talend.designer.webservice.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.webservice.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.designer.webservice

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.webservice.nl</artifactId>

i18n/plugins/org.talend.designer.xmlmap.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.designer.xmlmap.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.designer.xmlmap

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.xmlmap.nl</artifactId>

i18n/plugins/org.talend.expressionbuilder.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Expression Builder Nl Fragment
 Bundle-SymbolicName: org.talend.expressionbuilder.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.expressionbuilder
 Bundle-Vendor: .Talend SA.

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.expressionbuilder.nl</artifactId>

i18n/plugins/org.talend.presentation.onboarding.resource.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NL
 Bundle-SymbolicName: org.talend.presentation.onboarding.resource.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.presentation.onboarding.resource
 Bundle-Vendor: .Talend SA.

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>

i18n/plugins/org.talend.presentation.onboarding.resource.tos.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NL
 Bundle-SymbolicName: org.talend.presentation.onboarding.resource.tos.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.presentation.onboarding.resource.tos
 Bundle-Vendor: .Talend SA.

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>

i18n/plugins/org.talend.repository.ftp.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.ftp.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.repository.ftp

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.ftp.nl</artifactId>

i18n/plugins/org.talend.repository.json.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.repository.json.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.repository.json
 Bundle-Vendor: .Talend SA.

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.json.nl</artifactId>

i18n/plugins/org.talend.repository.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.repository.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.repository
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.nl</artifactId>

i18n/plugins/org.talend.repository.nl/src/main/java/messages_en.properties

@@ -477,7 +477,7 @@ SecurityProjectSettingPage.hidePass=Hide password for document generation
 SelectDeleteProjectDialog.deleteWarning=Do not delete projects physically
 SelectorTableForm.enterType=Enter type name prefix or pattern (*,?).
 SelectorTableForm.nameFilter=Name Filter\:
-connections.form.field.usernameNoMail=User name
+connections.form.field.usernameNoMail=User Name
 ImportProjectSettings.Error=Project settings file is invalid !
 ExportTreeViewer.hideJobTree=Hide job tree
 ExportTreeViewer.selectItems=Select the items to Export:

i18n/plugins/org.talend.repository.view.di.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.view.di.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.repository.view.di

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.view.di.nl</artifactId>

i18n/plugins/org.talend.sbi.engines.client.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.sbi.engines.client.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.sbi.engines.client

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sbi.engines.client.nl</artifactId>

i18n/plugins/org.talend.spagic.engines.client.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.spagic.engines.client.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Fragment-Host: org.talend.spagic.engines.client

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.spagic.engines.client.nl</artifactId>

i18n/plugins/org.talend.sqlbuilder.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.sqlbuilder Nl Fragment
 Bundle-SymbolicName: org.talend.sqlbuilder.nl
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.sqlbuilder
 Bundle-Localization: plugin

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sqlbuilder.nl</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.componentdesigner.feature"
       label="Componentdesigner_feature Feature"
-      version="6.2.0.qualifier"
+      version="6.3.0.qualifier"
       provider-name=".Talend SA.">
 
    <description url="http://www.example.com/description">

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.componentdesigner.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.designer.business.feature"
       label="Business Feature"
-      version="6.2.0.qualifier"
+      version="6.3.0.qualifier"
       provider-name=".Talend SA.">
 
    <description url="http://www.talend.com/online/featuresdescription.html#business-feature">

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.designer.feature"
       label="Designer Feature"
-      version="6.2.0.qualifier"
+      version="6.3.0.qualifier"
       provider-name=".Talend SA.">
 
    <description url="http://www.talend.com/online/featuresdescription.html#designer-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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.rcp.branding.tos.feature"
       label="Tos branding feature"
-      version="6.2.0.qualifier"
+      version="6.3.0.qualifier"
       provider-name=".Talend SA."
       plugin="org.talend.rcp.branding.tos">
 
@@ -51,4 +51,12 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
+
+   <plugin
+         id="org.talend.designer.maven.tos"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
 </feature>

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.rcp.branding.tos.test.feature"
       label="Test feature for TOS"
-      version="6.2.0.qualifier">
+      version="6.3.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -337,11 +337,52 @@
          fragment="true"
          unpack="false"/>
 
-	<plugin
+   <plugin
          id="org.talend.designer.webservice.test"
          download-size="0"
          install-size="0"
          version="0.0.0"
          fragment="true"
          unpack="false"/>
+
+   <plugin
+         id="org.talend.updates.runtime.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.view.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.migrationTool.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.metadata.managment.ui.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.model.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
 </feature>

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.repository.feature"
       label="Repository Feature"
-      version="6.2.0.qualifier"
+      version="6.3.0.qualifier"
       provider-name=".Talend SA.">
 
    <description url="http://www.talend.com/online/featuresdescription.html#repository-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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.sbi.feature"
       label="SBI Feature"
-      version="6.2.0.qualifier"
+      version="6.3.0.qualifier"
       provider-name=".Talend SA.">
 
    <description url="http://www.talend.com/online/featuresdescription.html#sbi-feature">

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sbi.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.spagic.feature"
       label="SPAGIC Feature"
-      version="6.2.0.qualifier"
+      version="6.3.0.qualifier"
       provider-name=".Talend SA.">
 
    <description url="http://www.talend.com/online/featuresdescription.html#spagic-feature">

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.spagic.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.tos.components.feature"
       label="Components-feature"
-      version="6.2.0.qualifier">
+      version="6.3.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -254,6 +254,14 @@
          fragment="true"
          unpack="false"/>
 
+   <plugin
+         id="biz.aQute.bnd.annotation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
    <plugin
          id="org.talend.components.api"
          download-size="0"
@@ -262,6 +270,14 @@
          fragment="true"
          unpack="false"/>
 
+   <plugin
+         id="org.talend.components.api.service"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
    <plugin
          id="org.talend.components.common"
          download-size="0"
@@ -292,12 +308,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.talend.components.salesforce"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
    <plugin
          id="org.talend.components.salesforce"
          download-size="0"
@@ -319,10 +329,4 @@
          version="0.0.0"
          unpack="false"/>
          
-   <plugin
-         id="org.talend.components.dataprep"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 </feature>

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.components.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.tos.feature"
       label="Tos feature"
-      version="6.2.0.qualifier"
+      version="6.3.0.qualifier"
       provider-name=".Talend SA.">
 
    <description url="http://www.example.com/description">

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.tos.libraries.feature"
       label="Libraries_feature"
-      version="6.2.0.qualifier">
+      version="6.3.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -295,11 +295,5 @@
          install-size="0"
          version="1.0.4.v201101211617"
          unpack="false"/>
-
-   <plugin
-         id="org.talend.libraries.redshift"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
+         
 </feature>

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.libraries.feature</artifactId>

main/plugins/org.talend.componentdesigner.rcp/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Rcp Plug-in
 Bundle-SymbolicName: org.talend.componentdesigner.rcp; singleton:=true
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Bundle-Activator: org.talend.componentdesigner.rcp.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.componentdesigner.rcp</artifactId>

main/plugins/org.talend.componentdesigner/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Componentdesigner Plug-in
 Bundle-SymbolicName: org.talend.componentdesigner; singleton:=true
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Bundle-Activator: org.talend.componentdesigner.ComponentDesigenerPlugin
 Require-Bundle: org.talend.model,
  org.eclipse.ui,

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

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

main/plugins/org.talend.designer.abstractmap/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Abstract Map Plug-in
 Bundle-SymbolicName: org.talend.designer.abstractmap;singleton:=true
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Bundle-Activator: org.talend.designer.abstractmap.MapPlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.talend.core,

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.abstractmap</artifactId>

main/plugins/org.talend.designer.alfrescooutput/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Alfresco Output Component Plug-in
 Bundle-SymbolicName: org.talend.designer.alfrescooutput;singleton:=true
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Bundle-Vendor: .Talend SA.
 Require-Bundle: org.eclipse.core.runtime,
  org.talend.core,

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.alfrescooutput</artifactId>

main/plugins/org.talend.designer.business.diagram/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.talend.designer.business.diagram; singleton:=true
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.talend.designer.business.model.business.diagram.part.BusinessDiagramEditorPlugin
 Bundle-Vendor: %providerName

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.2.0-SNAPSHOT</version>
+    <version>6.3.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.diagram</artifactId>

main/plugins/org.talend.designer.codegen/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CodeGen Plug-in
 Bundle-SymbolicName: org.talend.designer.codegen;singleton:=true
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.talend.core.repository,
  org.eclipse.emf.codegen,

main/plugins/org.talend.designer.codegen/jet_stub/footer_java.skeleton

@@ -49,7 +49,8 @@ public class CLASS
         if(isMultiThread){
             toReturn += "\n}catch (java.lang.Error e_" + rootNode.getUniqueName() + ") {\n";
             toReturn += "globalMap.put(\""+rootNode.getUniqueName()+ "_SUBPROCESS_STATE\", -1);\n";
-            toReturn += "\ne_" + rootNode.getUniqueName() + ".printStackTrace();\n";
+            toReturn += failure_multiThread;
+            toReturn += "throw e_" + rootNode.getUniqueName() + ";\n";
         }
        toReturn += "\n}"; 
        return toReturn;

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

@@ -1,36 +1,37 @@
 <%@ jet
 imports="
-        java.util.List
+        org.talend.designer.core.generic.model.Component
         java.util.ArrayList
+        java.util.HashMap
+        java.util.HashSet
+        java.util.List
         java.util.Map
         java.util.Set
-        java.util.HashSet
-        java.util.HashMap
         java.util.Stack
         org.talend.components.api.component.ComponentDefinition
         org.talend.components.api.component.EndpointComponentDefinition
         org.talend.components.api.component.InputComponentDefinition
         org.talend.components.api.component.OutputComponentDefinition
-        org.talend.components.api.properties.ComponentProperties
         org.talend.components.api.container.RuntimeContainer
-        org.talend.daikon.properties.Property
-        org.talend.daikon.NamedThing
-		org.talend.designer.core.generic.model.Component
+        org.talend.components.api.properties.ComponentProperties
         org.talend.core.model.metadata.IMetadataColumn
         org.talend.core.model.metadata.IMetadataTable
         org.talend.core.model.metadata.types.JavaType
         org.talend.core.model.metadata.types.JavaTypesManager
+        org.talend.core.model.process.EConnectionType
         org.talend.core.model.process.ElementParameterParser
-        org.talend.core.model.process.IElementParameter
+        org.talend.core.model.process.EParameterFieldType
         org.talend.core.model.process.IConnection
         org.talend.core.model.process.IConnectionCategory
-        org.talend.core.model.process.EConnectionType
+        org.talend.core.model.process.IElementParameter
         org.talend.core.model.process.INode
         org.talend.core.model.utils.TalendTextUtils
+        org.talend.daikon.NamedThing
+        org.talend.daikon.properties.property.Property
         org.talend.designer.codegen.config.CodeGeneratorArgument
-        org.talend.core.model.process.EParameterFieldType
         "
 %>
+<%@include file="@{org.talend.designer.codegen}/jet_stub/generic/component_util_indexedrecord_to_rowstruct.javajet"%>
 <%
 CodeGeneratorArgument codeGenArgument = (CodeGeneratorArgument) argument;
 INode node = (INode)codeGenArgument.getArgument();
@@ -42,93 +43,92 @@ ComponentDefinition def = component.getComponentDefinition();
 List<IMetadataTable> metadatas = node.getMetadataList();
 IMetadataTable metadata = null;
 List<IMetadataColumn> columnList = null;
-boolean hasDynamic = false;
-String dynamicColName = null;
-int dynamicPos = -1;
 if ((metadatas != null) && (metadatas.size() > 0)) { // metadata
-
-	metadata = metadatas.get(0);
-	if(metadata != null){
-	    columnList = metadata.getListColumns();
-		int nbSchemaColumns = columnList.size();
-
-		hasDynamic = false;
-
-		int pos = 0;
-		for (IMetadataColumn column : columnList) {
-			if (column.getTalendType().equals("id_Dynamic")) {
-				hasDynamic = true;
-				dynamicPos = pos;
-				dynamicColName = column.getLabel();
-				break;
-			}
-			pos++;
-		}
-	}
+    metadata = metadatas.get(0);
+    if(metadata != null){
+        columnList = metadata.getListColumns();
+    }
 }
+
+// Set up the component definition, and the properties for all types of
+// components.
+
 %>
 
 org.talend.components.api.component.ComponentDefinition def_<%=cid %> =
-   new <%= def.getClass().getName()%>();
+        new <%= def.getClass().getName()%>();
 <%
 List<Component.CodegenPropInfo> propsToProcess = component.getCodegenPropInfos(componentProps);
 %>
 
-<%= componentProps.getClass().getName()%> props_<%=cid %> = (<%= componentProps.getClass().getName()%>) def_<%=cid %>.createRuntimeProperties();
+<%= componentProps.getClass().getName()%> props_<%=cid %> =
+        (<%= componentProps.getClass().getName()%>) def_<%=cid %>.createRuntimeProperties();
 <%
 
 for (Component.CodegenPropInfo propInfo : propsToProcess) { // propInfo
-	List<NamedThing> properties = propInfo.props.getProperties();
-	for (NamedThing prop : properties) { // property
+    List<NamedThing> properties = propInfo.props.getProperties();
+    for (NamedThing prop : properties) { // property
         if (prop instanceof Property) { // if, only deal with valued Properties
             Property property = (Property)prop;
             if (property.getFlags() != null && (property.getFlags().contains(Property.Flags.DESIGN_TIME_ONLY) || property.getFlags().contains(Property.Flags.HIDDEN)))
-            	continue;
-		    Object value = property.getValue();
-            if (value != null && (value instanceof List)) { // if
+                continue;
+            Object value = property.getStoredValue();
+            if (value != null) {
+                if (value instanceof List) { // if
                     // added for the support of tables
-                        String tmpVarName = cid+propInfo.fieldName.replace('.','_')+"_"+property.getName();
-                        %>
-                        java.util.List<String> <%=tmpVarName %> = new java.util.ArrayList<String>();
-                        <%
-                        for (String subPropertyValue : (java.util.List<String>)property.getValue()) {
-                            if ((property.getType() == Property.Type.BOOLEAN) || (property.getType() == Property.Type.ENUM)) {
-                            %>
-                                <%=tmpVarName %>.add("<%=subPropertyValue %>");
-                            <%
-                            } else {
-                            	if(!"".equals(subPropertyValue)) {
-                            %>
-                                <%=tmpVarName %>.add(<%=subPropertyValue %>);
-                            <%
-                            	} else {
-                            %>
-                                <%=tmpVarName %>.add("");
-                            <%
-                            	}
-                            }
-                        }
-                        %>
-                        ((org.talend.daikon.properties.Properties)props_<%=cid %><%=propInfo.fieldName%>).setValue("<%=property.getName()%>",<%=tmpVarName %>);
+                    String tmpVarName = cid+propInfo.fieldName.replace('.','_')+"_"+property.getName();
+                    %>
+                    java.util.List<Object> <%=tmpVarName %> = new java.util.ArrayList<Object>();
                     <%
-            }  else if (property.isFlag(Property.Flags.ENCRYPT) && ElementParameterParser.canEncryptValue(property.getStringValue())) {
+                    for (Object subPropertyValue : (java.util.List<Object>)property.getValue()) {
+                        if (property.getPossibleValues() != null && property.getPossibleValues().size() > 0) {
+                            %>
+                            <%=tmpVarName %>.add("<%=subPropertyValue %>");
+                            <%
+                        } else if(!"".equals(subPropertyValue)) {
+                                %>
+                                <%=tmpVarName %>.add(<%=subPropertyValue %>);
+                                <%
+                        } else {
+                            %>
+                            <%=tmpVarName %>.add("");
+                            <%
+                        }
+                    }
+                    %>
+                    ((org.talend.daikon.properties.Properties)props_<%=cid %><%=propInfo.fieldName%>).setValue("<%=property.getName()%>",<%=tmpVarName %>);
+                    <%
+                }  else if (value instanceof String && property.isFlag(Property.Flags.ENCRYPT) && ElementParameterParser.canEncryptValue((String) value)) {
+                    if (!"".equals(property.getStringValue())) {
+                        %>
+                        props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
+                        routines.system.PasswordEncryptUtil.decryptPassword(<%=component.getCodegenValue(property, (String) value)%>));
+                        <%
+                    }
+                } else if (value != null && "java.util.Date".equals(property.getType())){
                     %>
                     props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
-                    routines.system.PasswordEncryptUtil.decryptPassword(<%=component.getCodegenValue(property, property.getStringValue())%>));
+                        TalendDate.parseDate("yyyy-MM-dd HH:mm:ss",<%=component.getCodegenValue(property, value.toString())%>));
                     <%
-            } else if (value != null && Property.Type.DATE.equals(property.getType())){
-            		%>
-    				props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
-	                	TalendDate.parseDate("yyyy-MM-dd HH:mm:ss",<%=component.getCodegenValue(property, property.getStringValue())%>));
-    				<%
-            } else if (value != null && (!(value instanceof String) || !((String)value).equals(""))) { // if
-					%>
+                } else if (property instanceof org.talend.daikon.properties.property.EnumProperty) {
+                    %>
                     props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
-                    <%=component.getCodegenValue(property, property.getStringValue())%>);
+                        <%=property.getType()%>.<%=property.getValue()%>);
                     <%
-    		} // if
+                } else if (property instanceof org.talend.daikon.properties.property.SchemaProperty) {
+                    %>
+                    props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
+                        new org.apache.avro.Schema.Parser().parse(<%=component.getCodegenValue(property, property.getStringValue())%>));
+                    <%
+                } else if (!(value instanceof String) || !((String)value).equals("")) { // if
+                    %>
+                    props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
+                    <%=component.getCodegenValue(property, value.toString())%>);
+                    <%
+                } // if
+            }
         }//else may be a ComponentProperties so ignore
-	} // property
+    } // property
 } // propInfo
 %>
 org.talend.components.api.container.RuntimeContainer container_<%=cid%> = new org.talend.components.api.container.RuntimeContainer() {
@@ -145,323 +145,206 @@ org.talend.components.api.container.RuntimeContainer container_<%=cid%> = new or
     }
 };
 
+int nb_line_<%=cid %> = 0;
+
 <%
 if (def instanceof EndpointComponentDefinition) {
-%>
-	org.talend.components.api.component.runtime.SourceOrSink sourceOrSink_<%=cid%> = ((org.talend.components.api.component.EndpointComponentDefinition)def_<%=cid%>).getRuntime();
-	sourceOrSink_<%=cid%>.initialize(container_<%=cid%>, props_<%=cid%>);
-	org.talend.daikon.properties.ValidationResult vr_<%=cid%> = sourceOrSink_<%=cid%>.validate(container_<%=cid%>);
-	if (vr_<%=cid%>.getStatus() == org.talend.daikon.properties.ValidationResult.Result.ERROR ) {
-		throw new RuntimeException(vr_<%=cid%>.getMessage());
-	}
-<%
+    %>
+    org.talend.components.api.component.runtime.SourceOrSink sourceOrSink_<%=cid%> = ((org.talend.components.api.component.EndpointComponentDefinition)def_<%=cid%>).getRuntime();
+    sourceOrSink_<%=cid%>.initialize(container_<%=cid%>, props_<%=cid%>);
+    org.talend.daikon.properties.ValidationResult vr_<%=cid%> = sourceOrSink_<%=cid%>.validate(container_<%=cid%>);
+    if (vr_<%=cid%>.getStatus() == org.talend.daikon.properties.ValidationResult.Result.ERROR ) {
+        throw new RuntimeException(vr_<%=cid%>.getMessage());
+    }
+    <%
 }
 
-if (metadata != null) {
-	if (def instanceof InputComponentDefinition) {
-%>
-		org.talend.components.api.component.runtime.Source source_<%=cid%> = (org.talend.components.api.component.runtime.Source)sourceOrSink_<%=cid%>;
-		org.talend.components.api.component.runtime.Reader reader_<%=cid%> = source_<%=cid%>.createReader(container_<%=cid%>);
+// Return at this point if there is no metadata.
+if (metadata == null)
+    return stringBuffer.toString();
 
-		<%
-		IConnection main = null;
-		List<? extends IConnection> mains = node.getOutgoingConnections(EConnectionType.FLOW_MAIN);
-		if(mains!=null && !mains.isEmpty()) {
-			main = mains.get(0);
-		}
-		
-		IConnection reject = null;
-    	for(IConnection outConn : node.getOutgoingConnections()) {
-    		if(!outConn.getLineStyle().hasConnectionCategory(IConnectionCategory.DATA)) {
-    			continue;
-    		}
-    		
-    		if(main!=null && main.getName().equals(outConn.getName())) {
-    			continue;
-    		}
-    		
-    		reject = outConn;
-    		
-    		break;
-    	}
-		
-		boolean hasDataOutput = main!=null || reject!=null;
-		
-		// FIXME - multiple outgoing connections?
-		
-        if(hasDataOutput) {
-        	if(hasDynamic){
-        	%>
-        		boolean initDyn_<%=cid%> = false;
-        		routines.system.Dynamic dynamic_<%=cid%> = new routines.system.Dynamic();
-        	<%
-        	}
-        	
-        	IConnection schemaSourceConnector = (main!=null ? main : reject);
-			String schemaSourceConnectorName = schemaSourceConnector.getMetadataTable().getAttachedConnector();
-        	%>
-        		boolean multi_output_is_allowed_<%=cid%> = false;
-            	<% //take care SourceOrSink.validate will change the schema if it contains include-all-fields, so need to get design Avro schema before validate %>
-                org.talend.components.api.component.Connector c_<%=cid%> = null;
-                for (org.talend.components.api.component.Connector currentConnector : props_<%=cid %>.getAvailableConnectors(null, true)) {
-                    if (currentConnector.getName().equals("<%=schemaSourceConnectorName%>")) {
-                        c_<%=cid%> = currentConnector;
-                    }
-                    
-                    if (currentConnector.getName().equals("REJECT")) {//it's better to move the code to javajet
-                        multi_output_is_allowed_<%=cid%> = true;
-                    }
-                }
-                org.apache.avro.Schema schema_<%=cid%> = props_<%=cid %>.getSchema(c_<%=cid%>, true);
+if (def instanceof InputComponentDefinition) {
+    %>
+    org.talend.components.api.component.runtime.Source source_<%=cid%> =
+            (org.talend.components.api.component.runtime.Source)sourceOrSink_<%=cid%>;
+    org.talend.components.api.component.runtime.Reader reader_<%=cid%> =
+            source_<%=cid%>.createReader(container_<%=cid%>);
 
-                org.talend.daikon.talend6.Talend6OutgoingSchemaEnforcer current_<%=cid%> = new org.talend.daikon.talend6.Talend6OutgoingSchemaEnforcer(schema_<%=cid%>, false);
-                
-                // Create a reusable factory that converts the output of the reader to an IndexedRecord.
-                org.talend.daikon.avro.IndexedRecordAdapterFactory<Object, ? extends org.apache.avro.generic.IndexedRecord> factory_<%=cid%> = null;
+    <%
+    IConnection main = null;
+    List<? extends IConnection> mains = node.getOutgoingConnections("MAIN");
+    if (mains!=null && !mains.isEmpty()) {
+        main = mains.get(0);
+    }
 
-		<%
-		}
-		%>
-                // Iterate through the incoming data.
-                for(boolean available = reader_<%=cid%>.start(); available; available = reader_<%=cid%>.advance()) {//}
-		<%
-		if(hasDataOutput) {
-		%>
-					if(multi_output_is_allowed_<%=cid%>) {
-						<%if(main!=null){%>
-						<%=main.getName()%> = null;
-						<%}%>
-						
-						<%if(reject!=null){%>
-						<%=reject.getName()%> = null;
-						<%}%>
-					}
-					
-					try {
-						Object data_<%=cid%> = reader_<%=cid%>.getCurrent();
-						
-						<%if(main!=null){%>
-						
-						if(multi_output_is_allowed_<%=cid%>) {
-							<%=main.getName()%> = new <%=main.getName() %>Struct();
-						}
-					
-	                    // Construct the factory once when the first data arrives.
-	                    if (factory_<%=cid%> == null)
-	                        factory_<%=cid%> = (org.talend.daikon.avro.IndexedRecordAdapterFactory<Object, ? extends org.apache.avro.generic.IndexedRecord>) new org.talend.daikon.avro.AvroRegistry()
-	                                .createAdapterFactory(data_<%=cid%>.getClass());
+    IConnection reject = null;
+    List<? extends IConnection> rejects = node.getOutgoingConnections("REJECT");
+    if (rejects != null && !rejects.isEmpty()) {
+        reject = rejects.get(0);
+    }
+    
+	boolean hasDataOutput = (main != null || reject != null);
+	IndexedRecordToRowStructGenerator irToRow = null;
 	
-	                    // Enforce the outgoing schema on the input.
-	                    org.apache.avro.generic.IndexedRecord unenforced_<%=cid%> = factory_<%=cid%>.convertToAvro(data_<%=cid%>);
-	                    current_<%=cid%>.setWrapped(unenforced_<%=cid%>);
-	                    
-	                    <%
-						if(hasDynamic){
-						%>
-							if(!initDyn_<%=cid%>){
-								org.apache.avro.Schema dynSchema_<%=cid%> = current_<%=cid%>.getOutgoingDynamicRuntimeSchema();
-	
-								for(org.apache.avro.Schema.Field childDynamic_<%=cid%> : dynSchema_<%=cid%>.getFields()){
-									routines.system.DynamicMetadata dynamicMetadata_<%=cid%> = new routines.system.DynamicMetadata();
-							    	dynamicMetadata_<%=cid%>.setName(childDynamic_<%=cid%>.name());
-							    	dynamicMetadata_<%=cid%>.setDbName(childDynamic_<%=cid%>.name());
-							    	String talendType_<%=cid%> = null;
-							    	if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.ARRAY){
-							    		talendType_<%=cid%> = "<%=JavaTypesManager.LIST.getId()%>";
-							    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.BOOLEAN){
-							    		talendType_<%=cid%> = "<%=JavaTypesManager.BOOLEAN.getId()%>";
-							    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.BYTES){
-							    		talendType_<%=cid%> = "<%=JavaTypesManager.BYTE_ARRAY.getId()%>";
-							    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.FIXED){
-							    		talendType_<%=cid%> = "<%=JavaTypesManager.BYTE_ARRAY.getId()%>";
-							    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.DOUBLE){
-							    		talendType_<%=cid%> = "<%=JavaTypesManager.DOUBLE.getId()%>";
-							    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.FLOAT){
-							    		talendType_<%=cid%> = "<%=JavaTypesManager.FLOAT.getId()%>";
-							    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.INT){
-							    		talendType_<%=cid%> = "<%=JavaTypesManager.INTEGER.getId()%>";
-							    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.LONG){
-							    		talendType_<%=cid%> = "<%=JavaTypesManager.LONG.getId()%>";
-							    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.ENUM){
-							    		talendType_<%=cid%> = "<%=JavaTypesManager.STRING.getId()%>";
-							    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.STRING){
-							    		talendType_<%=cid%> = "<%=JavaTypesManager.STRING.getId()%>";
-							    	}
-							    	dynamicMetadata_<%=cid%>.setType(talendType_<%=cid%>);
-							    	dynamic_<%=cid%>.metadatas.add(dynamicMetadata_<%=cid%>);
-								}
-								initDyn_<%=cid%> = true;
-							}
-							dynamic_<%=cid%>.clearColumnValues();
-	                    <%
-	                    }
-	                    
-	                    List<IMetadataColumn> main_output_columnList = main.getMetadataTable().getListColumns();
-	                    
-	                    for (int i = 0; i < main_output_columnList.size(); i++) {
-	                        IMetadataColumn column = main_output_columnList.get(i);
-	                        String columnName = column.getLabel();
-	                        JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
-	                        String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
-	                        if(columnName.equals(dynamicColName)){
-	                        %>
-	                        	java.util.Map<String, Object> dynamicValue_<%=cid%> = (java.util.Map<String, Object>)current_<%=cid%>.get(<%=i%>);
-	                        	for(String dynamicValue_Key_<%=cid%> : dynamicValue_<%=cid%>.keySet()){
-	                        		dynamic_<%=cid%>.setColumnValue(dynamic_<%=cid%>.getIndex(dynamicValue_Key_<%=cid%>), dynamicValue_<%=cid%>.get(dynamicValue_Key_<%=cid%>));
-	                        	}
-								<%=main.getName()%>.<%=dynamicColName%> = dynamic_<%=cid%>;
-	                        <%
-	                        }else{
-	                        %>
-	                        	if(current_<%=cid%>.get(<%=i%>) == null){
-	                        		<%=main.getName()%>.<%=columnName%> = <%=JavaTypesManager.getDefaultValueFromJavaType(typeToGenerate)%>;
-	                        	}else{
-	                        		<%if(javaType == JavaTypesManager.STRING){%>
-	                        			<%=main.getName()%>.<%=columnName%> = String.valueOf(current_<%=cid%>.get(<%=i%>));
-	                        		<%}else{%>
-		                        		<%=main.getName()%>.<%=columnName%> = (<%=typeToGenerate%>)(current_<%=cid%>.get(<%=i%>));
-		                        	<%}%>
-	                        	}
-	                    	<%
-	                    	}
-	                    }
-	                    %>
-	                    
-                	<%}%>
-        		} catch (org.talend.components.api.exception.DataRejectException e_<%=cid%>) {
-					<%if(reject!=null){%>
-					java.util.Map<String,Object> info_<%=cid%> = e_<%=cid%>.getRejectInfo();
-					Object data_<%=cid%> = info_<%=cid%>.get("talend_record");
-					
-					if(multi_output_is_allowed_<%=cid%>) {
-						<%=reject.getName()%> = new <%=reject.getName() %>Struct();
-					}
-				
-                    // Construct the factory once when the first data arrives.
-                    if (factory_<%=cid%> == null)
-                        factory_<%=cid%> = (org.talend.daikon.avro.IndexedRecordAdapterFactory<Object, ? extends org.apache.avro.generic.IndexedRecord>) new org.talend.daikon.avro.AvroRegistry()
-                                .createAdapterFactory(data_<%=cid%>.getClass());
-
-                    // Enforce the outgoing schema on the input.
-                    org.apache.avro.generic.IndexedRecord unenforced_<%=cid%> = factory_<%=cid%>.convertToAvro(data_<%=cid%>);
-                    current_<%=cid%>.setWrapped(unenforced_<%=cid%>);
-                    
-                    <%
-					if(hasDynamic){
-					%>
-						if(!initDyn_<%=cid%>){
-							org.apache.avro.Schema dynSchema_<%=cid%> = current_<%=cid%>.getOutgoingDynamicRuntimeSchema();
-
-							for(org.apache.avro.Schema.Field childDynamic_<%=cid%> : dynSchema_<%=cid%>.getFields()){
-								routines.system.DynamicMetadata dynamicMetadata_<%=cid%> = new routines.system.DynamicMetadata();
-						    	dynamicMetadata_<%=cid%>.setName(childDynamic_<%=cid%>.name());
-						    	dynamicMetadata_<%=cid%>.setDbName(childDynamic_<%=cid%>.name());
-						    	String talendType_<%=cid%> = null;
-						    	if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.ARRAY){
-						    		talendType_<%=cid%> = "<%=JavaTypesManager.LIST.getId()%>";
-						    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.BOOLEAN){
-						    		talendType_<%=cid%> = "<%=JavaTypesManager.BOOLEAN.getId()%>";
-						    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.BYTES){
-						    		talendType_<%=cid%> = "<%=JavaTypesManager.BYTE_ARRAY.getId()%>";
-						    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.FIXED){
-						    		talendType_<%=cid%> = "<%=JavaTypesManager.BYTE_ARRAY.getId()%>";
-						    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.DOUBLE){
-						    		talendType_<%=cid%> = "<%=JavaTypesManager.DOUBLE.getId()%>";
-						    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.FLOAT){
-						    		talendType_<%=cid%> = "<%=JavaTypesManager.FLOAT.getId()%>";
-						    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.INT){
-						    		talendType_<%=cid%> = "<%=JavaTypesManager.INTEGER.getId()%>";
-						    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.LONG){
-						    		talendType_<%=cid%> = "<%=JavaTypesManager.LONG.getId()%>";
-						    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.ENUM){
-						    		talendType_<%=cid%> = "<%=JavaTypesManager.STRING.getId()%>";
-						    	}else if(childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.STRING){
-						    		talendType_<%=cid%> = "<%=JavaTypesManager.STRING.getId()%>";
-						    	}
-						    	dynamicMetadata_<%=cid%>.setType(talendType_<%=cid%>);
-						    	dynamic_<%=cid%>.metadatas.add(dynamicMetadata_<%=cid%>);
-							}
-							initDyn_<%=cid%> = true;
-						}
-						dynamic_<%=cid%>.clearColumnValues();
-                    <%
-                    }
-                    
-                    Set<String> commonColumns = new HashSet<String>();
-                    
-                    for (int i = 0; i < columnList.size(); i++) {
-                        IMetadataColumn column = columnList.get(i);
-                        String columnName = column.getLabel();
-                        
-                        commonColumns.add(columnName);
-                        
-                        JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
-                        String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
-                        if(columnName.equals(dynamicColName)){
-                        %>
-                        	java.util.Map<String, Object> dynamicValue_<%=cid%> = (java.util.Map<String, Object>)current_<%=cid%>.get(<%=i%>);
-                        	for(String dynamicValue_Key_<%=cid%> : dynamicValue_<%=cid%>.keySet()){
-                        		dynamic_<%=cid%>.setColumnValue(dynamic_<%=cid%>.getIndex(dynamicValue_Key_<%=cid%>), dynamicValue_<%=cid%>.get(dynamicValue_Key_<%=cid%>));
-                        	}
-							<%=main.getName()%>.<%=dynamicColName%> = dynamic_<%=cid%>;
-                        <%
-                        }else{
-                        %>
-                        	if(current_<%=cid%>.get(<%=i%>) == null){
-                        		<%=main.getName()%>.<%=columnName%> = <%=JavaTypesManager.getDefaultValueFromJavaType(typeToGenerate)%>;
-                        	}else{
-                        		<%if(javaType == JavaTypesManager.STRING){%>
-                        			<%=main.getName()%>.<%=columnName%> = String.valueOf(current_<%=cid%>.get(<%=i%>));
-                        		<%}else{%>
-	                        		<%=main.getName()%>.<%=columnName%> = (<%=typeToGenerate%>)(current_<%=cid%>.get(<%=i%>));
-	                        	<%}%>
-                        	}
-                    	<%
-                    	}
-                    }
-                    
-                    //pass error columns
-            		List<IMetadataColumn> rejectColumns = reject.getMetadataTable().getListColumns();
-            		for(IMetadataColumn column : rejectColumns) {
-            			String columnName = column.getLabel();
-            			
-            			JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
-                        String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
-                        
-            			//error columns
-            			if(!commonColumns.contains(columnName)) {
-            			%>
-            			<%=reject.getName()%>.<%=columnName%> = (<%=typeToGenerate%>)info_<%=cid%>.get("<%=columnName%>");
-            			<%
-            			}
-            		}
-                    %>
-	                    
-					<%}%>
-				}
-        <%
-		}
-	} else if (def instanceof OutputComponentDefinition) {
+	if(hasDataOutput) {
+    	IConnection schemaSourceConnector = (main!=null ? main : reject);
+    	String schemaSourceConnectorName = schemaSourceConnector.getMetadataTable().getAttachedConnector();
 	%>
-		org.talend.components.api.component.runtime.Sink sink_<%=cid%> = (org.talend.components.api.component.runtime.Sink)sourceOrSink_<%=cid%>;
-		org.talend.components.api.component.runtime.WriteOperation writeOperation_<%=cid%> = sink_<%=cid%>.createWriteOperation();
-		writeOperation_<%=cid%>.initialize(container_<%=cid%>);<%//create folder for file; create database/table for db%>
-		org.talend.components.api.component.runtime.Writer writer_<%=cid%> = writeOperation_<%=cid%>.createWriter(container_<%=cid%>);
-		writer_<%=cid%>.open("<%=cid%>");
+        boolean multi_output_is_allowed_<%=cid%> = false;
+        <% //take care SourceOrSink.validate will change the schema if it contains include-all-fields, so need to get design Avro schema before validate %>
         org.talend.components.api.component.Connector c_<%=cid%> = null;
-	<%//Why didn't we use false here? This is an Output component, so we need input connectors, don't we?%>
-        for (org.talend.components.api.component.Connector currentConnector : props_<%=cid %>.getAvailableConnectors(null, false)) {
-            if (currentConnector.getName().equals("MAIN")) {
+        for (org.talend.components.api.component.Connector currentConnector : props_<%=cid %>.getAvailableConnectors(null, true)) {
+            if (currentConnector.getName().equals("<%=schemaSourceConnectorName%>")) {
                 c_<%=cid%> = currentConnector;
-                break;
+            }
+    
+            if (currentConnector.getName().equals("REJECT")) {//it's better to move the code to javajet
+                multi_output_is_allowed_<%=cid%> = true;
             }
         }
-	<%//Why didn't we use false here? This is an Output component, so we need input connectors, don't we? However, the boolean argument isn't used in the code.
-	//Maybe we need to remove it from the method signature at all? It could be used in other places, so I won't touch it for now.%>
-        org.apache.avro.Schema designSchema_<%=cid%> = props_<%=cid %>.getSchema(c_<%=cid%>, false);
-        org.talend.daikon.talend6.Talend6IncomingSchemaEnforcer current_<%=cid%>
-                = new org.talend.daikon.talend6.Talend6IncomingSchemaEnforcer(designSchema_<%=cid%>);
-	<%
-	}
+        org.apache.avro.Schema schema_<%=cid%> = props_<%=cid %>.getSchema(c_<%=cid%>, true);
+
+    <%
+    	irToRow = new IndexedRecordToRowStructGenerator(cid, null, columnList);
+    	irToRow.generateInitialVariables("schema_" + cid, false);
+    }
+    %>
+	
+    // Iterate through the incoming data.
+    boolean available_<%=cid%> = reader_<%=cid%>.start();
+    
+    resourceMap.put("reader_<%=cid%>", reader_<%=cid%>);
+    
+    for (; available_<%=cid%>; available_<%=cid%> = reader_<%=cid%>.advance()) {
+    	nb_line_<%=cid %>++;
+    	
+    	<%if(hasDataOutput) {%>
+        if (multi_output_is_allowed_<%=cid%>) {
+            <%if(main!=null){%>
+                <%=main.getName()%> = null;
+            <%}%>
+
+            <%if(reject!=null){%>
+                <%=reject.getName()%> = null;
+            <%}%>
+        }
+        <%}%>
+
+        try {
+            Object data_<%=cid%> = reader_<%=cid%>.getCurrent();
+            <%
+            if (main != null) {
+                %>
+
+                if(multi_output_is_allowed_<%=cid%>) {
+                    <%=main.getName()%> = new <%=main.getName() %>Struct();
+                }
+
+                <%
+                irToRow.generateConvertRecord("data_" + cid, main.getName(), main.getMetadataTable().getListColumns());
+            }
+            %>
+        } catch (org.talend.components.api.exception.DataRejectException e_<%=cid%>) {
+        	java.util.Map<String,Object> info_<%=cid%> = e_<%=cid%>.getRejectInfo();
+            <%
+            if (reject!=null) {
+                %>
+                Object data_<%=cid%> = info_<%=cid%>.get("talend_record");
+
+                if (multi_output_is_allowed_<%=cid%>) {
+                    <%=reject.getName()%> = new <%=reject.getName() %>Struct();
+                }
+
+                <%
+                irToRow.generateConvertRecord("data_" + cid, reject.getName());
+                Set<String> commonColumns = new HashSet<String>();
+
+                for (IMetadataColumn column : columnList) {
+                    commonColumns.add(column.getLabel());
+                }
+
+                //pass error columns
+                List<IMetadataColumn> rejectColumns = reject.getMetadataTable().getListColumns();
+                for(IMetadataColumn column : rejectColumns) {
+                    String columnName = column.getLabel();
+
+                    // JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
+                    String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
+
+                    //error columns
+                    if(!commonColumns.contains(columnName)) {
+                        %>
+                        <%=reject.getName()%>.<%=columnName%> = (<%=typeToGenerate%>)info_<%=cid%>.get("<%=columnName%>");
+                        <%
+                    }
+                }
+            } else {
+            %>
+            	//TODO use a method instead of getting method by the special key "error"
+            	String errorMessage_<%=cid%> = "Row "+ nb_line_<%=cid %> + ":" + info_<%=cid%>.get("error");
+    			System.err.println(errorMessage_<%=cid%>);
+            <%
+            }
+        %>
+    }
+    <%
+    // The for loop around the incoming records from the reader is left open.
+
+
+} else if (def instanceof OutputComponentDefinition) {
+    %>
+    org.talend.components.api.component.runtime.Sink sink_<%=cid%> =
+            (org.talend.components.api.component.runtime.Sink)sourceOrSink_<%=cid%>;
+    org.talend.components.api.component.runtime.WriteOperation writeOperation_<%=cid%> = sink_<%=cid%>.createWriteOperation();
+    writeOperation_<%=cid%>.initialize(container_<%=cid%>);
+    org.talend.components.api.component.runtime.Writer writer_<%=cid%> = writeOperation_<%=cid%>.createWriter(container_<%=cid%>);
+    writer_<%=cid%>.open("<%=cid%>");
+    
+    resourceMap.put("writer_<%=cid%>", writer_<%=cid%>);
+    
+    org.talend.components.api.component.Connector c_<%=cid%> = null;
+    for (org.talend.components.api.component.Connector currentConnector : props_<%=cid %>.getAvailableConnectors(null, false)) {
+        if (currentConnector.getName().equals("MAIN")) {
+            c_<%=cid%> = currentConnector;
+            break;
+        }
+    }
+    org.apache.avro.Schema designSchema_<%=cid%> = props_<%=cid %>.getSchema(c_<%=cid%>, false);
+    org.talend.daikon.di.DiIncomingSchemaEnforcer current_<%=cid%>
+            = new org.talend.daikon.di.DiIncomingSchemaEnforcer(designSchema_<%=cid%>);
+    <%
+    List<? extends IConnection> outgoingConns = node.getOutgoingSortedConnections();
+    if (outgoingConns!=null){
+        for (IConnection outgoingConn : outgoingConns) {
+            if ("MAIN".equals(outgoingConn.getConnectorName())) {
+                %>
+                c_<%=cid%> = null;
+                for (org.talend.components.api.component.Connector currentConnector : props_<%=cid %>.getAvailableConnectors(null, true)) {
+                    if (currentConnector.getName().equals("MAIN")) {
+                        c_<%=cid%> = currentConnector;
+                    }
+                }
+                org.apache.avro.Schema mainSchema_<%=cid%> = props_<%=cid %>.getSchema(c_<%=cid%>, true);
+                <%
+                IndexedRecordToRowStructGenerator mainIrToRow = new IndexedRecordToRowStructGenerator(
+                        cid + "OutMain", outgoingConn);
+                mainIrToRow.generateInitialVariables("mainSchema_" + cid, false);
+            }
+            if ("REJECT".equals(outgoingConn.getConnectorName())) {
+                %>
+                c_<%=cid%> = null;
+                for (org.talend.components.api.component.Connector currentConnector : props_<%=cid %>.getAvailableConnectors(null, true)) {
+                    if (currentConnector.getName().equals("REJECT")) {
+                        c_<%=cid%> = currentConnector;
+                    }
+                }
+                org.apache.avro.Schema rejectSchema_<%=cid%> = props_<%=cid %>.getSchema(c_<%=cid%>, true);
+                <%
+                IndexedRecordToRowStructGenerator rejectIrToRow = new IndexedRecordToRowStructGenerator(
+                        cid + "OutReject", outgoingConn);
+                rejectIrToRow.generateInitialVariables("rejectSchema_" + cid, false);
+            }
+        }
+    }
 }
 %>

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

@@ -1,16 +1,16 @@
-<%@ jet 
+<%@ jet
 imports="
-		org.talend.components.api.component.ComponentDefinition
-		org.talend.designer.core.generic.model.Component
-    	org.talend.core.model.process.INode 
-    	org.talend.core.model.process.ElementParameterParser 
-		org.talend.core.model.metadata.IMetadataTable 
-		org.talend.core.model.metadata.IMetadataColumn		
-		org.talend.designer.codegen.config.CodeGeneratorArgument
-		org.talend.core.model.process.IConnection
-		org.talend.core.model.process.IConnectionCategory
-		java.util.List
-		"
+        java.util.List
+        org.talend.components.api.component.ComponentDefinition
+        org.talend.core.model.metadata.IMetadataColumn
+        org.talend.core.model.metadata.IMetadataTable
+        org.talend.core.model.process.ElementParameterParser
+        org.talend.core.model.process.IConnection
+        org.talend.core.model.process.IConnectionCategory
+        org.talend.core.model.process.INode
+        org.talend.designer.codegen.config.CodeGeneratorArgument
+        org.talend.designer.core.generic.model.Component
+        "
 %>
 // end of generic
 
@@ -24,25 +24,57 @@ ComponentDefinition def = component.getComponentDefinition();
 IMetadataTable metadata = null;
 List<IMetadataTable> metadatas = node.getMetadataList();
 if ((metadatas != null) && (metadatas.size() > 0)) {
-	metadata = metadatas.get(0);
+    metadata = metadatas.get(0);
 }
 
+// Return at this point if there is no metadata.
 if (metadata == null) {
-	return stringBuffer.toString();
+    return stringBuffer.toString();
 }
+%>
 
+resourceMap.put("finish_<%=cid%>", Boolean.TRUE);
+
+<%
 if(def instanceof org.talend.components.api.component.InputComponentDefinition){
 %>
-	} // while
-<%
-%>
-
-	reader_<%=cid%>.close();
+    } // while
+    reader_<%=cid%>.close();
+    final java.util.Map<String, Object> resultMap_<%=cid%> = reader_<%=cid%>.getReturnValues();
 <%
 }else if(def instanceof org.talend.components.api.component.OutputComponentDefinition){
-// Output
 %>
-	writer_<%=cid%>.close();
+    org.talend.components.api.component.runtime.Result resultObject_<%=cid%> = (org.talend.components.api.component.runtime.Result)writer_<%=cid%>.close();
+    final java.util.Map<String, Object> resultMap_<%=cid%> = writer_<%=cid%>.getWriteOperation().finalize(java.util.Arrays.<org.talend.components.api.component.runtime.Result>asList(resultObject_<%=cid%>), container_<%=cid%>);
 <%
 }
 %>
+if(resultMap_<%=cid%>!=null) {
+	for(java.util.Map.Entry<String,Object> entry_<%=cid%> : resultMap_<%=cid%>.entrySet()) {
+		switch(entry_<%=cid%>.getKey()) {
+		case org.talend.components.api.component.ComponentDefinition.RETURN_ERROR_MESSAGE :
+			container_<%=cid%>.setComponentData("<%=cid%>", "ERROR_MESSAGE", entry_<%=cid%>.getValue());
+			break;
+		case org.talend.components.api.component.ComponentDefinition.RETURN_TOTAL_RECORD_COUNT :
+			container_<%=cid%>.setComponentData("<%=cid%>", "NB_LINE", entry_<%=cid%>.getValue());
+			break;
+		case org.talend.components.api.component.ComponentDefinition.RETURN_SUCCESS_RECORD_COUNT :
+			container_<%=cid%>.setComponentData("<%=cid%>", "NB_SUCCESS", entry_<%=cid%>.getValue());
+			break;
+		case org.talend.components.api.component.ComponentDefinition.RETURN_REJECT_RECORD_COUNT :
+			container_<%=cid%>.setComponentData("<%=cid%>", "NB_REJECT", entry_<%=cid%>.getValue());
+			break;
+		default :
+            StringBuilder studio_key_<%=cid%> = new StringBuilder();
+            for (int i_<%=cid%> = 0; i_<%=cid%> < entry_<%=cid%>.getKey().length(); i_<%=cid%>++) {
+                char ch_<%=cid%> = entry_<%=cid%>.getKey().charAt(i_<%=cid%>);
+                if(Character.isUpperCase(ch_<%=cid%>) && i_<%=cid%>> 0) {
+                	studio_key_<%=cid%>.append('_');
+                }
+                studio_key_<%=cid%>.append(ch_<%=cid%>);
+            }
+			container_<%=cid%>.setComponentData("<%=cid%>", studio_key_<%=cid%>.toString().toUpperCase(java.util.Locale.ENGLISH), entry_<%=cid%>.getValue());
+			break;
+		}
+	}
+}

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

@@ -0,0 +1,62 @@
+<%@ jet
+imports="
+        java.util.List
+        org.talend.components.api.component.ComponentDefinition
+        org.talend.core.model.metadata.IMetadataColumn
+        org.talend.core.model.metadata.IMetadataTable
+        org.talend.core.model.process.ElementParameterParser
+        org.talend.core.model.process.IConnection
+        org.talend.core.model.process.IConnectionCategory
+        org.talend.core.model.process.INode
+        org.talend.designer.codegen.config.CodeGeneratorArgument
+        org.talend.designer.core.generic.model.Component
+        "
+%>
+// finally of generic
+
+<%
+CodeGeneratorArgument codeGenArgument = (CodeGeneratorArgument) argument;
+INode node = (INode)codeGenArgument.getArgument();
+String cid = node.getUniqueName();
+Component component = (Component)node.getComponent();
+ComponentDefinition def = component.getComponentDefinition();
+
+IMetadataTable metadata = null;
+List<IMetadataTable> metadatas = node.getMetadataList();
+if ((metadatas != null) && (metadatas.size() > 0)) {
+    metadata = metadatas.get(0);
+}
+
+// Return at this point if there is no metadata.
+if (metadata == null) {
+    return stringBuffer.toString();
+}
+%>
+
+if(resourceMap.get("finish_<%=cid%>")==null){
+<%
+if(def instanceof org.talend.components.api.component.InputComponentDefinition){
+%>
+    if(resourceMap.get("reader_<%=cid%>")!=null){
+		try {
+			((org.talend.components.api.component.runtime.Reader)resourceMap.get("reader_<%=cid%>")).close();
+		} catch (java.io.IOException e_<%=cid %>) {
+			String errorMessage_<%=cid%> = "failed to release the resource in <%=cid %> :" + e_<%=cid %>.getMessage();
+			System.err.println(errorMessage_<%=cid%>);
+		}
+	}
+<%
+}else if(def instanceof org.talend.components.api.component.OutputComponentDefinition){
+%>
+    if(resourceMap.get("writer_<%=cid%>")!=null){
+		try {
+			((org.talend.components.api.component.runtime.Writer)resourceMap.get("writer_<%=cid%>")).close();
+		} catch (java.io.IOException e_<%=cid %>) {
+			String errorMessage_<%=cid%> = "failed to release the resource in <%=cid %> :" + e_<%=cid %>.getMessage();
+			System.err.println(errorMessage_<%=cid%>);
+		}
+	}
+<%
+}
+%>
+}

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

@@ -18,8 +18,7 @@ imports="
         org.talend.core.model.utils.TalendTextUtils
         "
 %>
-// main of generic (used only for output components)
-
+<%@include file="@{org.talend.designer.codegen}/jet_stub/generic/component_util_indexedrecord_to_rowstruct.javajet"%>
 <%
 CodeGeneratorArgument codeGenArgument = (CodeGeneratorArgument) argument;
 INode node = (INode)codeGenArgument.getArgument();
@@ -28,48 +27,69 @@ Component component = (Component)node.getComponent();
 ComponentDefinition def = component.getComponentDefinition();
 
 if(def instanceof org.talend.components.api.component.OutputComponentDefinition){
-    %>
+    // These will be initialized if there are outgoing connections and will be
+    // null if there isn't a corresponding outgoing connection.
+    IndexedRecordToRowStructGenerator mainIrToRow = null;
+    IndexedRecordToRowStructGenerator rejectIrToRow = null;
 
-    // OUTPUT
-
-    <%
     List<? extends IConnection> outgoingConns = node.getOutgoingSortedConnections();
     if (outgoingConns!=null){
         for (int i = 0; i < outgoingConns.size(); i++) {
             IConnection outgoingConn = outgoingConns.get(i);
             if (outgoingConn.getLineStyle().hasConnectionCategory(IConnectionCategory.DATA)) {
-            %>
+                %>
                 <%=outgoingConn.getName()%> = null;
-            <%
+                <%
+            }
+            if ("MAIN".equals(outgoingConn.getConnectorName())) {
+                mainIrToRow = new IndexedRecordToRowStructGenerator(cid + "OutMain",
+                        outgoingConn);
+            }
+            if ("REJECT".equals(outgoingConn.getConnectorName())) {
+                rejectIrToRow = new IndexedRecordToRowStructGenerator(cid + "OutReject",
+                        outgoingConn);
             }
         }
     }
 
-    List<IMetadataTable> metadatas = node.getMetadataList();
-    IMetadataTable metadata;
-    if ((metadatas != null) && (metadatas.size() > 0) && (metadata = metadatas.get(0)) != null) { // metadata
-        List<IMetadataColumn> columnList = metadata.getListColumns();
-        int dynamicPos = -1;
-        for (int i = 0; i < columnList.size(); i++) {
-            if (columnList.get(i).getTalendType().equals("id_Dynamic")) {
-                dynamicPos = i;
-                break;
-            }
-        }
-        %>
-        // METADATA
-        <%
+    // Generate the code to handle the incoming records.
+    IConnection inputConn = null;
+    List< ? extends IConnection> inputConns = node.getIncomingConnections();
+    if(inputConns!=null) {
+	   	for (IConnection conn : inputConns) {
+	   		if (conn.getLineStyle().hasConnectionCategory(IConnectionCategory.DATA)) {
+	   			inputConn = conn;
+	    	}
+	   	}
+   	}
 
-        List< ? extends IConnection> conns = node.getIncomingConnections();
-        for (IConnection conn : conns) { // conn
+   	boolean hasValidInput = inputConn!=null;
+
+   	IMetadataTable metadata;
+    List<IMetadataTable> metadatas = node.getMetadataList();
+    boolean haveValidNodeMetadata = ((metadatas != null) && (metadatas.size() > 0) && (metadata = metadatas.get(0)) != null);
+
+    if (hasValidInput && haveValidNodeMetadata) {
+        List<IMetadataColumn> input_columnList = inputConn.getMetadataTable().getListColumns();
+
+        if (input_columnList!=null && !input_columnList.isEmpty()) {
             // If there are dynamic columns in the schema, they need to be
             // initialized into the runtime schema of the actual IndexedRecord
             // provided to the component.
+
+            int dynamicPos = -1;
+	        for (int i = 0; i < input_columnList.size(); i++) {
+	            if (input_columnList.get(i).getTalendType().equals("id_Dynamic")) {
+	                dynamicPos = i;
+	                break;
+	            }
+	        }
+
             if (dynamicPos != -1)  {
                 %>
                 if (current_<%=cid%>.needsInitDynamicColumns()) {
                     // Initialize the dynamic columns when they are first encountered.
-                    for (routines.system.DynamicMetadata dm_<%=cid%> : <%=conn.getName()%>.<%=columnList.get(dynamicPos).getLabel()%>.metadatas) {
+                    for (routines.system.DynamicMetadata dm_<%=cid%> : <%=inputConn.getName()%>.<%=input_columnList.get(dynamicPos).getLabel()%>.metadatas) {
                         current_<%=cid%>.initDynamicColumn(
                                 dm_<%=cid%>.getName(), dm_<%=cid%>.getDbName(),
                                 dm_<%=cid%>.getType(), dm_<%=cid%>.getDbType(),
@@ -84,104 +104,81 @@ if(def instanceof org.talend.components.api.component.OutputComponentDefinition)
                 <%
             }
 
-            if (conn.getLineStyle().hasConnectionCategory(IConnectionCategory.DATA)) { // conn line style
-                for (int i = 0; i < columnList.size(); i++) { // column
-                    IMetadataColumn column = columnList.get(i);
-                    if (dynamicPos != i) {
-                        %>
-                        current_<%=cid%>.put("<%=column.getLabel()%>", <%=conn.getName()%>.<%=column.getLabel()%>);
-                        <%
-                    } else {
-                        %>
-                        for (int i = 0; i < <%=conn.getName()%>.<%=column.getLabel()%>.getColumnCount(); i++) {
-                            current_<%=cid%>.put(<%=conn.getName()%>.<%=column.getLabel()%>.getColumnMetadata(i).getName(),
-                                    <%=conn.getName()%>.<%=column.getLabel()%>.getColumnValue(i));
-                        }
-                        <%
+            for (int i = 0; i < input_columnList.size(); i++) { // column
+                IMetadataColumn column = input_columnList.get(i);
+                if (dynamicPos != i) {
+                    %>
+                    current_<%=cid%>.put("<%=column.getLabel()%>", <%=inputConn.getName()%>.<%=column.getLabel()%>);
+                    <%
+                } else {
+                    %>
+                    for (int i = 0; i < <%=inputConn.getName()%>.<%=column.getLabel()%>.getColumnCount(); i++) {
+                        current_<%=cid%>.put(<%=inputConn.getName()%>.<%=column.getLabel()%>.getColumnMetadata(i).getName(),
+                                <%=inputConn.getName()%>.<%=column.getLabel()%>.getColumnValue(i));
                     }
-                } // column
+                    <%
+                }
+            } // column
+
+            // If necesary, generate the code to handle outgoing connections.
+            // TODO: For now, this can only handle one outgoing record for
+            // each incoming record.  To handle multiple outgoing records, code
+            // generation needs to occur in component_begin in order to open
+            // a for() loop.
+
+            // There will be a ClassCastException if the output component does
+            // not implement WriterWithFeedback, but permits outgoing
+            // connections.
+
+            %>
+            Object data_<%=cid%> = current_<%=cid%>.createIndexedRecord();
+
+            writer_<%=cid%>.write(data_<%=cid%>);
+            
+            nb_line_<%=cid %>++;
+            <%
+            if (mainIrToRow != null) {
                 %>
-                
-                Object data_<%=cid%> = current_<%=cid%>.createIndexedRecord();
-                
-                try {
-                	writer_<%=cid%>.write(data_<%=cid%>);
+                java.util.Iterator<?> outgoingMainRecords_<%=cid%> = ((org.talend.components.api.component.runtime.WriterWithFeedback<?, ?, ?>)writer_<%=cid%>).getSuccessfulWrites().iterator();
+                Object outgoingMain_<%=cid%> = null;
+                if (outgoingMainRecords_<%=cid%>.hasNext()) {
+                    outgoingMain_<%=cid%> = outgoingMainRecords_<%=cid%>.next();
+                    if(outgoingMainRecords_<%=cid%>.hasNext()){
+                    	outgoingMain_<%=cid%> = data_<%=cid%>;
+                    }
+                }
+                <%
+                if (rejectIrToRow == null) {
+                %>
+                else{
+                	if (!((org.talend.components.api.component.runtime.WriterWithFeedback<?, ?, ?>)writer_<%=cid%>).getRejectedWrites().iterator().hasNext()) {
+                		outgoingMain_<%=cid%> = data_<%=cid%>;
+                	}
+                }
+                <%
+                }
+                %>
+                if(outgoingMain_<%=cid%>!=null){
+                	<%=mainIrToRow.getConnection().getName()%> = new <%=mainIrToRow.getConnection().getName() %>Struct();
                 	<%
-                	//pass the main flow
-                	IConnection main = null;
-                	List<? extends IConnection> mains = node.getOutgoingConnections(EConnectionType.FLOW_MAIN);
-                	if(mains!=null && !mains.isEmpty()) {
-                		main = mains.get(0);
-                		%>
-                		<%=main.getName()%> = new <%=main.getName() %>Struct();
-                		<%
-                		for (IMetadataColumn column : columnList) {
-	                		%>
-	                		<%=main.getName()%>.<%=column.getLabel()%> = <%=conn.getName()%>.<%=column.getLabel()%>;
-	                		<%
-                		}
-                		
-                		//TODO how to pass the additional columns in output connection? like salesforce_id
-                	}
-                	%>
-                } catch (org.talend.components.api.exception.DataRejectException e_<%=cid%>) {
-                	<%
-                	//pass the reject flow
-                	//the method below can't wrok now, TODO fix it
-                	//List<? extends IConnection> rejects = node.getOutgoingConnections(EConnectionType.REJECT);
-                	
-                	IConnection reject = null;
-                	for(IConnection outConn : node.getOutgoingConnections()) {
-                		if(!outConn.getLineStyle().hasConnectionCategory(IConnectionCategory.DATA)) {
-                			continue;
-                		}
-                		
-                		if(main!=null && main.getName().equals(outConn.getName())) {
-                			continue;
-                		}
-                		
-                		reject = outConn;
-                		
-                		break;
-                	}
-                	
-                	if(reject!=null) {
-                		Set<String> commonColumns = new HashSet<String>();
-                		%>
-                		<%=reject.getName()%> = new <%=reject.getName() %>Struct();
-                		<%
-                		for (IMetadataColumn column : columnList) {
-                			commonColumns.add(column.getLabel());
-	                		%>
-	                		<%=reject.getName()%>.<%=column.getLabel()%> = <%=conn.getName()%>.<%=column.getLabel()%>;
-	                		<%
-                		}
-                		%>
-                		
-                		java.util.Map<String,Object> info_<%=cid%> = e_<%=cid%>.getRejectInfo();
-                		
-                		<%
-                		//pass error columns
-                		List<IMetadataColumn> rejectColumns = reject.getMetadataTable().getListColumns();
-                		for(IMetadataColumn column : rejectColumns) {
-                			String columnName = column.getLabel();
-                			
-                			JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
-	                        String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
-	                        
-                			//error columns
-                			if(!commonColumns.contains(columnName)) {
-                			%>
-                			<%=reject.getName()%>.<%=columnName%> = (<%=typeToGenerate%>)info_<%=cid%>.get("<%=columnName%>");
-                			<%
-                			}
-                		}
-                	}
-                	%>
+                    mainIrToRow.generateConvertRecord("outgoingMain_" + cid, mainIrToRow.getConnection().getName());
+                    %>
                 }
             <%
-            } // conn line style
-        } // conn
-    } // metadata
+            }
+            if (rejectIrToRow != null) {
+                %>
+                java.util.Iterator<?> outgoingRejectRecords_<%=cid%> = ((org.talend.components.api.component.runtime.WriterWithFeedback<?, ?, ?>)writer_<%=cid%>).getRejectedWrites().iterator();
+                if (outgoingRejectRecords_<%=cid%>.hasNext()) {
+                    <%=rejectIrToRow.getConnection().getName()%> = new <%=rejectIrToRow.getConnection().getName() %>Struct();
+                    Object outgoingReject_<%=cid%> = outgoingRejectRecords_<%=cid%>.next();
+                    <%
+                    rejectIrToRow.generateConvertRecord("outgoingReject_" + cid, rejectIrToRow.getConnection().getName());
+                    %>
+                }
+                <%
+            }
+        }
+    }
 } // canStart
 %>

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

@@ -0,0 +1,215 @@
+<%
+
+/**
+ * Utility for generating code that can turn an IndexedRecording coming from a
+ * generic component into a rowStruct expected by the Studio.
+ */
+class IndexedRecordToRowStructGenerator {
+
+    /** A unique tag for generating code variables, usually based on the cid
+     *  of the node. */
+    private final String cid;
+
+    /** The columns in the rowStruct to generate. */
+    private final List<IMetadataColumn> columns;
+
+    /** The connection that we're generating code for. */
+    private final IConnection connection;
+
+    /** If there is a dynamic column, its name.  Null if none. */
+    private final String dynamicColName;
+
+    /** Variable names generated in code used by this utility. */
+    private final String codeVarSchemaEnforcer;
+    private final String codeVarIsDynamicInitialized;
+    private final String codeVarDynamic;
+    private final String codeVarIndexedRecordAdapter;
+
+    public IndexedRecordToRowStructGenerator(String cid, IConnection connection) {
+        this(cid, connection, connection.getMetadataTable().getListColumns());
+    }
+
+    public IndexedRecordToRowStructGenerator(String cid, IConnection connection, List<IMetadataColumn> columns) {
+        this.cid = cid;
+        this.connection = connection;
+        this.columns = columns;
+
+        String tmpDynamicColName = null;
+        for (IMetadataColumn column : columns) {
+            if (column.getTalendType().equals("id_Dynamic")) {
+                tmpDynamicColName = column.getLabel();
+                break;
+            }
+        }
+        dynamicColName = tmpDynamicColName;
+
+        this.codeVarSchemaEnforcer = "current_" + cid;
+        this.codeVarIsDynamicInitialized = "initDyn_" + cid;
+        this.codeVarDynamic = "dynamic_" + cid;
+        this.codeVarIndexedRecordAdapter = "factory_" + cid;
+    }
+
+    public IConnection getConnection() {
+        return connection;
+    }
+
+    /**
+     * Generate code that declares and initializes the variables that are used
+     * in the code generated by this utility.
+     */
+    public void generateInitialVariables(String codeVarSchemaToEnforce, boolean dynamicByPosition) {
+        if (dynamicColName != null) {
+            %>
+            boolean <%=codeVarIsDynamicInitialized%> = false;
+            routines.system.Dynamic <%=codeVarDynamic%> = new routines.system.Dynamic();
+            <%
+        }
+
+        %>
+        org.talend.daikon.di.DiOutgoingSchemaEnforcer <%=codeVarSchemaEnforcer%>
+                = new org.talend.daikon.di.DiOutgoingSchemaEnforcer(<%=codeVarSchemaToEnforce%>, <%=dynamicByPosition%>);
+
+        // Create a reusable factory that converts the output of the reader to an IndexedRecord.
+        org.talend.daikon.avro.converter.IndexedRecordConverter<Object, ? extends org.apache.avro.generic.IndexedRecord> <%=codeVarIndexedRecordAdapter%> = null;
+        <%
+    }
+
+    /**
+     * Generate code that copies data from the IndexedRecord to the rowStruct.
+     *
+     * @param codeVarIndexedRecord the name of the variable that contains the
+     *    IndexedRecord.
+     * @param codeVarRowStruct the name of the variable that contains the
+     *    rowStruct.
+     */
+    public void generateConvertRecord(String codeVarIndexedRecord, String codeVarRowStruct) {
+        generateConvertRecord(codeVarIndexedRecord, codeVarRowStruct, columns);
+    }
+
+    /**
+     * Generate code that copies data from the IndexedRecord to the rowStruct.
+     *
+     * @param codeVarIndexedRecord the name of the variable that contains the
+     *    IndexedRecord.
+     * @param codeVarRowStruct the name of the variable that contains the
+     *    rowStruct.
+     * @param columnsToGenerate the list of columns in the rowStruct to generate
+     *    code for.
+     */
+    public void generateConvertRecord(String codeVarIndexedRecord, String codeVarRowStruct, List<IMetadataColumn> columnsToGenerate) {
+        %>
+        // Construct the factory once when the first data arrives.
+        if (<%=codeVarIndexedRecordAdapter%> == null) {
+            <%=codeVarIndexedRecordAdapter%> = (org.talend.daikon.avro.converter.IndexedRecordConverter<Object, ? extends org.apache.avro.generic.IndexedRecord>)
+                    new org.talend.daikon.avro.AvroRegistry()
+                            .createIndexedRecordConverter(<%=codeVarIndexedRecord%>.getClass());
+        }
+
+        // Enforce the outgoing schema on the input.
+        <%=codeVarSchemaEnforcer%>.setWrapped(<%=codeVarIndexedRecordAdapter%>.convertToAvro(<%=codeVarIndexedRecord%>));
+        <%
+
+        if (dynamicColName != null) {
+            %>
+            if (!<%=codeVarIsDynamicInitialized%>) {
+                org.apache.avro.Schema dynSchema_<%=cid%> = <%=codeVarSchemaEnforcer%>.getOutgoingDynamicRuntimeSchema();
+                for (org.apache.avro.Schema.Field childDynamic_<%=cid%> : dynSchema_<%=cid%>.getFields()){
+                    routines.system.DynamicMetadata dynamicMetadata_<%=cid%> = new routines.system.DynamicMetadata();
+                    dynamicMetadata_<%=cid%>.setName(childDynamic_<%=cid%>.name());
+                    dynamicMetadata_<%=cid%>.setDbName(childDynamic_<%=cid%>.name());
+                    String talendType_<%=cid%> = null;
+                    org.apache.avro.Schema.Type type_<%=cid%> = childDynamic_<%=cid%>.schema().getType();
+                    if(type_<%=cid%>  == org.apache.avro.Schema.Type.UNION){
+                    	java.util.List<org.apache.avro.Schema> fieldTypes_<%=cid%> = childDynamic_<%=cid%>.schema().getTypes();
+                    	for(org.apache.avro.Schema fieldType_<%=cid%>:fieldTypes_<%=cid%>){
+                    		if(fieldType_<%=cid%>.getType() == org.apache.avro.Schema.Type.NULL){
+                    			dynamicMetadata_<%=cid%>.setNullable(true);
+                    		}else{
+                    			type_<%=cid%> = fieldType_<%=cid%>.getType();
+                    		}
+                    	}
+					}
+                    if (type_<%=cid%> == org.apache.avro.Schema.Type.ARRAY) {
+                        talendType_<%=cid%> = "<%=JavaTypesManager.LIST.getId()%>";
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.BOOLEAN) {
+                        talendType_<%=cid%> = "<%=JavaTypesManager.BOOLEAN.getId()%>";
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.BYTES) {
+                        talendType_<%=cid%> = "<%=JavaTypesManager.BYTE_ARRAY.getId()%>";
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.FIXED) {
+                        talendType_<%=cid%> = "<%=JavaTypesManager.BYTE_ARRAY.getId()%>";
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.DOUBLE) {
+                        talendType_<%=cid%> = "<%=JavaTypesManager.DOUBLE.getId()%>";
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.FLOAT) {
+                        talendType_<%=cid%> = "<%=JavaTypesManager.FLOAT.getId()%>";
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.INT) {
+                        talendType_<%=cid%> = "<%=JavaTypesManager.INTEGER.getId()%>";
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.LONG) {
+                    	String pattern_<%=cid%> = childDynamic_<%=cid%>.getProp(org.talend.daikon.di.DiSchemaConstants.TALEND6_COLUMN_PATTERN);
+                    	if(pattern_<%=cid%>!=null && !pattern_<%=cid%>.trim().isEmpty()){
+                    		talendType_<%=cid%> = "<%=JavaTypesManager.DATE.getId()%>";
+                    		dynamicMetadata_<%=cid%>.setFormat(pattern_<%=cid%>);
+                    	}else{
+                    		talendType_<%=cid%> = "<%=JavaTypesManager.LONG.getId()%>";
+                    	}
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.ENUM) {
+                        talendType_<%=cid%> = "<%=JavaTypesManager.STRING.getId()%>";
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.STRING) {
+                        talendType_<%=cid%> = "<%=JavaTypesManager.STRING.getId()%>";
+                    }
+                    Object length_<%=cid%> = childDynamic_<%=cid%>.getProp(org.talend.daikon.di.DiSchemaConstants.TALEND6_COLUMN_LENGTH);
+                    if(length_<%=cid%> != null){
+                    	dynamicMetadata_<%=cid%>.setLength(Integer.parseInt(String.valueOf(length_<%=cid%>)));
+                    }
+                    Object precision_<%=cid%> = childDynamic_<%=cid%>.getProp(org.talend.daikon.di.DiSchemaConstants.TALEND6_COLUMN_PRECISION); 
+                    if(precision_<%=cid%> != null){
+						dynamicMetadata_<%=cid%>.setPrecision(Integer.parseInt(String.valueOf(precision_<%=cid%>)));
+                    } 
+                    dynamicMetadata_<%=cid%>.setType(talendType_<%=cid%>);
+                    <%=codeVarDynamic%>.metadatas.add(dynamicMetadata_<%=cid%>);
+                }
+                initDyn_<%=cid%> = true;
+            }
+            <%=codeVarDynamic%>.clearColumnValues();
+            <%
+        }
+
+        for (int i = 0; i < columnsToGenerate.size(); i++) {
+            IMetadataColumn column = columnsToGenerate.get(i);
+            String columnName = column.getLabel();
+            JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
+            String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
+            if (columnName.equals(dynamicColName)) {
+                %>
+                java.util.Map<String, Object> dynamicValue_<%=cid%> =
+                        (java.util.Map<String, Object>) <%=codeVarSchemaEnforcer%>.get(<%=i%>);
+                for (String dynamicValue_Key_<%=cid%> : ((java.util.Map<String, Object>)<%=codeVarSchemaEnforcer%>.get(<%=i%>)).keySet()) {
+                    <%=codeVarDynamic%>.setColumnValue(
+                            <%=codeVarDynamic%>.getIndex(dynamicValue_Key_<%=cid%>),
+                            dynamicValue_<%=cid%>.get(dynamicValue_Key_<%=cid%>));
+                }
+                <%=codeVarRowStruct%>.<%=dynamicColName%> = <%=codeVarDynamic%>;
+                <%
+            } else {
+                %>
+                if (<%=codeVarSchemaEnforcer%>.get(<%=i%>) == null) {
+                     <%=codeVarRowStruct%>.<%=columnName%> = <%=JavaTypesManager.getDefaultValueFromJavaType(typeToGenerate)%>;
+                } else {
+                    <%
+                    if (javaType == JavaTypesManager.STRING) {
+                        %>
+                        <%=codeVarRowStruct%>.<%=columnName%> = String.valueOf(<%=codeVarSchemaEnforcer%>.get(<%=i%>));
+                        <%
+                    } else  {
+                        %>
+                        <%=codeVarRowStruct%>.<%=columnName%> = (<%=typeToGenerate%>) (<%=codeVarSchemaEnforcer%>.get(<%=i%>));
+                        <%
+                    }
+                    %>
+                }
+                <%
+            }
+        }
+    }
+
+}
+%>