Merge branch 'master' into qubole_spark_fix_cluster_label

kjwang/feat(TUP-20080)Create migration task for all modificatios of  talend.project.

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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.gefabstractmap.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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.nl</artifactId>

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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sqlbuilder.nl</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="7.0.1.qualifier"
+      version="7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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="7.0.1.qualifier"
+      version="7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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="7.0.1.qualifier"
+      version="7.1.1.qualifier"
       provider-name=".Talend SA."
       plugin="org.talend.rcp.branding.tos">
 

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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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="7.0.1.qualifier">
+      version="7.1.1.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -400,4 +400,12 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
+         
+    <plugin
+         id="org.talend.datatools.xml.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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="7.0.1.qualifier"
+      version="7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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="7.0.1.qualifier"
+      version="7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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="7.0.1.qualifier"
+      version="7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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="7.0.1.qualifier">
+      version="7.1.1.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -315,7 +315,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.talend.components.snowflake"
+         id="org.talend.components.snowflake.definition"
          download-size="0"
          install-size="0"
          version="0.0.0"

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

main/features/org.talend.tos.core.feature/.project

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

main/features/org.talend.tos.core.feature/build.properties

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

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

@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.tos.core.feature"
+      label="Feature"
+      version="7.1.1.qualifier">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <includes
+         id="org.talend.commons.feature"
+         version="0.0.0"
+         search-location="self"/>
+
+   <includes
+         id="org.talend.core.feature"
+         version="0.0.0"
+         search-location="self"/>
+
+   <includes
+         id="org.talend.repository.feature"
+         version="0.0.0"
+         search-location="self"/>
+
+   <includes
+         id="org.talend.designer.feature"
+         version="0.0.0"
+         search-location="self"/>
+
+   <includes
+         id="org.talend.rcp.feature"
+         version="0.0.0"
+         search-location="self"/>
+
+   <includes
+         id="org.talend.tos.components.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.talend.hadoop.distribution.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.talend.updates.feature"
+         version="0.0.0"/>
+
+   <requires>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.talend.commons.ui"/>
+      <import plugin="org.talend.designer.core"/>
+      <import plugin="org.eclipse.xsd"/>
+      <import plugin="org.apache.log4j"/>
+      <import plugin="org.talend.repository"/>
+      <import plugin="org.talend.core"/>
+      <import plugin="org.apache.axis"/>
+      <import plugin="javax.xml.rpc"/>
+   </requires>
+
+   <plugin
+         id="org.talend.repository.mdm"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.xsd"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.ftp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.ftp.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.mdm.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.libraries.json"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.repository.json"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.json.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.maven.job"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.transaction"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+</feature>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>7.1.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.tos.core.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.tos.feature"
       label="Tos feature"
-      version="7.0.1.qualifier"
+      version="7.1.1.qualifier"
       provider-name=".Talend SA.">
 
    <description url="http://www.example.com/description">
@@ -17,12 +17,8 @@
       [Enter License Description here.]
    </license>
 
-   <url>
-      <update label="TOS Talend update site for milestones" url="http://talendforge.org/core/updatesite/testing/"/>
-   </url>
-
    <includes
-         id="org.talend.commons.feature"
+         id="org.talend.tos.core.feature"
          version="0.0.0"
          search-location="self"/>
 
@@ -31,31 +27,11 @@
          version="0.0.0"
          search-location="self"/>
 
-   <includes
-         id="org.talend.core.feature"
-         version="0.0.0"
-         search-location="self"/>
-
-   <includes
-         id="org.talend.repository.feature"
-         version="0.0.0"
-         search-location="self"/>
-
-   <includes
-         id="org.talend.designer.feature"
-         version="0.0.0"
-         search-location="self"/>
-
    <includes
          id="org.talend.designer.business.feature"
          version="0.0.0"
          search-location="self"/>
 
-   <includes
-         id="org.talend.rcp.feature"
-         version="0.0.0"
-         search-location="self"/>
-
    <includes
          id="org.talend.sbi.feature"
          version="0.0.0"
@@ -66,91 +42,8 @@
          version="0.0.0"
          search-location="self"/>
 
-   <includes
-         id="org.talend.tos.components.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.talend.hadoop.distribution.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.talend.updates.feature"
-         version="0.0.0"/>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.talend.commons.ui"/>
-      <import plugin="org.talend.designer.core"/>
-      <import plugin="org.eclipse.xsd"/>
-      <import plugin="org.apache.log4j"/>
-      <import plugin="org.talend.repository"/>
-      <import plugin="org.talend.core"/>
-      <import plugin="org.apache.axis"/>
-      <import plugin="javax.xml.rpc"/>
-   </requires>
-
    <plugin
-         id="org.talend.repository.mdm"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.xsd"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.repository.ftp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.repository.ftp.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.repository.mdm.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.libraries.json"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.repository.json"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.repository.json.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.designer.maven.job"
+         id="org.talend.designer.tutorials"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -163,20 +56,5 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
-
-   <plugin
-         id="javax.transaction"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.designer.tutorials"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
          
 </feature>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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="7.0.1.qualifier">
+      version="7.1.1.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]

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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.libraries.feature</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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.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>7.0.1-SNAPSHOT</version>
+    <version>7.1.1-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: 7.0.1.qualifier
+Bundle-Version: 7.1.1.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.talend.core.repository,
  org.eclipse.emf.codegen,

main/plugins/org.talend.designer.codegen/jet_stub/footer.javajet

@@ -660,9 +660,16 @@ if(execStat) {
     try {
         runTrace.openSocket(!isChildJob);
         runTrace.startThreadTrace(clientHost, portTraces);
+        if (runTrace.isPause()) {
+			while (runTrace.isPause()) {
+				Thread.sleep(100);
+			}
+		}
     } catch (java.io.IOException ioException) {
         ioException.printStackTrace();
-    }
+    } catch (InterruptedException e) {
+			e.printStackTrace();
+	}
 <%
     }
 %>

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

@@ -11,6 +11,8 @@
  
      private final Component component;
      
+     private int schemaIndex = 0;
+     
      public ProcessPropertiesGenerator(String cid, Component component) {
          this.cid = cid;
          this.component = component;    
@@ -23,7 +25,9 @@
      
  		            Object value = property.getStoredValue();
  		            if (value != null) {
- 		            	if (setDynamicTags && (value instanceof String) && isDynamicValue(String.valueOf(value), connName)) {
+ 		            	boolean isSchemaProperty = property instanceof org.talend.daikon.properties.property.SchemaProperty;
+ 		            	
+ 		            	if (!isSchemaProperty && setDynamicTags && (value instanceof String) && isDynamicValue(String.valueOf(value), connName)) {
  		            		property.setTaggedValue(IGenericConstants.DYNAMIC_PROPERTY_VALUE, "true");
  		            	}
  		                if (value instanceof List) { // if
@@ -77,10 +81,64 @@
  		                    props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
  		                        <%=property.getType().replaceAll("<.*>", "")%>.<%=property.getValue()%>);
  		                    <%
- 		                } else if (property instanceof org.talend.daikon.properties.property.SchemaProperty) {
+ 		                } else if (isSchemaProperty) {
+ 		                		String schemaValue = component.getCodegenValue(property, property.getStringValue());
+ 		                		String[] splits = schemaValue.split("(?=\\\\\"name\\\\\":)");
+ 		                		
+ 		                		String classNameTail = "fisrt";
+ 		                		if(!firstCall) {
+ 		                			classNameTail = "second";
+ 		                		}
  		                    %>
+ 		                    class SchemaSettingTool_<%=cid%>_<%=++schemaIndex%>_<%=classNameTail%> {
+ 		                    		
+ 		                    		String getSchemaValue() {
+ 		                    				<%
+ 		                    				if((splits == null) || (splits.length < 2)) {
+ 		                    				%>
+ 		                    				return <%=schemaValue%>;
+ 		                    				<%
+ 		                    				} else {
+                    						%>
+ 		                    						StringBuilder s = new StringBuilder();
+                    						<%
+     		                    				for(int i=0; i<splits.length; i++) {
+     		                    						String currentSplit = splits[i];
+     		                    						if(i == 0) {
+     		                    						%>
+     		                    						a(<%=currentSplit%>",s);
+     		                    						<%
+     		                    								continue;
+     		                    						}
+     		                    						
+     		                    						if(i == (splits.length - 1)) {
+     		                    						%>
+     		                    						a("<%=currentSplit%>,s);
+     		                    						<%
+     		                    								continue;
+     		                    						}
+     		                    						
+     		                    						%>
+     		                    						a("<%=currentSplit%>",s);
+     		                    						<%
+     		                    				}
+     		                    		%>
+     		                    				return s.toString();
+     		                    		<%
+ 		                    				}
+ 		                    				%>
+ 		                    		}
+ 		                    		
+ 		                    		void a(String part, StringBuilder strB) {
+ 		                    				strB.append(part);
+ 		                    		}
+ 		                    		
+ 		                    }
+ 		                    
+ 		                    SchemaSettingTool_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%> sst_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%> = new SchemaSettingTool_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%>();
+ 		                    
  		                    props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
- 		                        new org.apache.avro.Schema.Parser().parse(<%=component.getCodegenValue(property, property.getStringValue())%>));
+ 		                        new org.apache.avro.Schema.Parser().parse(sst_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%>.getSchemaValue()));
  		                    <%
  		                } else if (!(value instanceof String) || !((String)value).equals("")) {
  		                    %>

main/plugins/org.talend.designer.codegen/jet_stub/header.javajet

@@ -22,6 +22,7 @@
 		org.talend.core.model.utils.NodeUtil
 		org.talend.core.model.utils.JavaResourcesHelper
 		org.talend.core.model.process.ProcessUtils
+        org.talend.designer.runprocess.ProcessorUtilities
 	"
 	class="Header"
 %>
@@ -137,7 +138,7 @@ for (INode node : process.getNodesOfType("tRESTClient")) {
     }
 }
 
-boolean talendEsbJob = actAsProvider || actAsConsumer || !process.getNodesOfType("tRouteInput").isEmpty();
+boolean talendEsbJob = ProcessorUtilities.isEsbJob(process.getId(), process.getVersion());
 boolean talendEsbJobFactory = actAsProvider || !process.getNodesOfType("tRouteInput").isEmpty();
 
 boolean talendStepTemplate = !process.getNodesOfType("tActionInput").isEmpty() || !process.getNodesOfType("tActionOutput").isEmpty() || !process.getNodesOfType("tJobReject").isEmpty();
@@ -209,11 +210,6 @@ protected static void logIgnoredError(String message, Throwable cause) {
 		// fix for TESB-7714
 		talendESBJob.setEndpointRegistry(registry);
 
-		// TESB-15920 tRESTClient and SAM not working
-		<% if (hasSAM4RS) { %>
-		talendESBJob.setEventFeature(eventFeature);
-		<% } %>
-
 		return talendESBJob;
 	}
 <% } %>

main/plugins/org.talend.designer.codegen/jet_stub/subprocess_header.javajet

@@ -97,7 +97,7 @@
 								}
 
 								// for tRecordMatching
-								if(conn.getTarget().getUniqueName().startsWith("tRecordMatching")){
+								if(conn.getTarget().getComponent().getName().equals("tRecordMatching")){
 									List<Map<String, String>> joinKeys = (List<Map<String,String>>)ElementParameterParser.getObjectValue(conn.getTarget(), "__BLOCKING_DEFINITION__");
 									for(Map<String, String> joinKeyLine : joinKeys){
 										String lookupKey = joinKeyLine.get("LOOKUP_COLUMN");

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

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

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/CodeGenerator.java

@@ -595,6 +595,13 @@ public class CodeGenerator implements ICodeGenerator {
                                     generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_END, incomingName, typeGen));
                         }
                     }
+
+                    if (isTacokitProcessor(node)) {
+                        codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_RECORDS_END, incomingName, typeGen));
+                        codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_BEGIN, incomingName, typeGen));
+                        codeComponent.append(generatesTreeCode(subProcess, node, ECodePart.MAIN, typeGen));
+                        codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_END, incomingName, typeGen));
+                    }
                     codeComponent.append(generatesTreeCode(subProcess, node, part, typeGen));
                     // if (isIterate) {
                     // codeComponent.append(generateComponentCode(node,
@@ -615,6 +622,11 @@ public class CodeGenerator implements ICodeGenerator {
         return codeComponent;
     }
 
+    private boolean isTacokitProcessor(final INode node) {
+        return "org.talend.sdk.component.studio.ComponentModel".equals(node.getComponent().getClass().getName())
+                && !NodeUtil.getIncomingConnections(node, IConnectionCategory.DATA).isEmpty(); //has input data
+    }
+
     private StringBuffer generateSeperateEndCode(NodesSubTree subProcess, INode node, String incomingName, ETypeGen typeGen)
             throws CodeGeneratorException {
         StringBuffer codeComponent = new StringBuffer();

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/JavaRoutineSynchronizer.java

@@ -147,7 +147,8 @@ public class JavaRoutineSynchronizer extends AbstractRoutineSynchronizer {
      */
     private static void syncModule(Project project, File[] modules) throws SystemException {
         IRunProcessService service = CodeGeneratorActivator.getDefault().getRunProcessService();
-        ITalendProcessJavaProject talenCodeJavaProject = service.getTalendCodeJavaProject(ERepositoryObjectType.ROUTINES, project);
+        ITalendProcessJavaProject talenCodeJavaProject = service.getTalendCodeJavaProject(ERepositoryObjectType.ROUTINES,
+                project.getTechnicalLabel());
         if (talenCodeJavaProject == null) {
             return;
         }

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/model/CodeGeneratorEmittersPoolFactory.java

@@ -216,6 +216,7 @@ public final class CodeGeneratorEmittersPoolFactory {
                     initGenericComponent(codeLanguage, jetBeans, ECodePart.PROCESS_DATA_BEGIN, genericComponent,
                             genericTemplates);
                     initGenericComponent(codeLanguage, jetBeans, ECodePart.PROCESS_DATA_END, genericComponent, genericTemplates);
+                    initGenericComponent(codeLanguage, jetBeans, ECodePart.PROCESS_RECORDS_END, genericComponent, genericTemplates);
                     initGenericComponent(codeLanguage, jetBeans, ECodePart.FINALLY, genericComponent, genericTemplates);
                 }
 

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Exchange Plug-in
 Bundle-SymbolicName: org.talend.designer.components.exchange;singleton:=true
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.1.1.qualifier
 Bundle-Activator: org.talend.designer.components.exchange.ExchangePlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,

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

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

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Components Libs Plug-in
 Bundle-SymbolicName: org.talend.designer.components.libs
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.1.1.qualifier
 Require-Bundle: org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: .Talend SA.

main/plugins/org.talend.designer.components.libs/libs_src/json-lib-talend/LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

main/plugins/org.talend.designer.components.libs/libs_src/json-lib-talend/README.md

@@ -0,0 +1,104 @@
+Json-lib with auto-expansion of properties
+=============
+
+The XML serialization is extended to handle automatic expansion of properties for arrays that contains objects.
+
+Source file to be serialized to and from JSON
+-------------
+```xml
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Document DOMVersion="8.0" Self="d">
+    <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.3-c011 66.145661, 2012/02/06-14:56:27">
+        <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+            <rdf:Description rdf:about=""
+                             xmlns:dc="http://purl.org/dc/elements/1.1/">
+                <dc:format>application/x-indesign</dc:format>
+            </rdf:Description>
+            <rdf:Description rdf:about=""
+                             xmlns:xmp="http://ns.adobe.com/xap/1.0/">
+                <xmp:CreatorTool>Adobe InDesign CS6 (Macintosh)</xmp:CreatorTool>
+            </rdf:Description>
+            <rdf:Description rdf:about=""
+                             xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
+                <xmpMM:InstanceID>xmp.iid:D093CC710A2068118083AFA2F0AAE3ED</xmpMM:InstanceID>
+            </rdf:Description>
+        </rdf:RDF>
+    </x:xmpmeta>
+</Document>
+```
+
+file.xml
+
+Original json-lib
+-------
+
+This code
+
+```java
+XMLSerializer serializer = new XMLSerializer();
+serializer.setTypeHintsEnabled(false);
+
+JSON jsonRepresentation = serializer.readFromFile( "file.xml" );
+
+String xml = serializer.write( jsonRepresentation );
+System.out.writeToReadme(xml)
+```
+
+will render:
+
+```xml
+<o DOMVersion="8.0" Self="d">
+    <x:xmpmeta xmptk="Adobe XMP Core 5.3-c011 66.145661, 2012/02/06-14:56:27" xmlns:x="adobe:ns:meta/">
+        <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+            <rdf:Description>
+                <e about="" xmlns:dc="http://purl.org/dc/elements/1.1/">
+                    <dc:format>application/x-indesign</dc:format>
+                </e>
+                <e about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">
+                    <xmp:CreatorTool>Adobe InDesign CS6 (Macintosh)</xmp:CreatorTool>
+                </e>
+                <e about="" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
+                    <xmpMM:InstanceID>xmp.iid:D093CC710A2068118083AFA2F0AAE3ED</xmpMM:InstanceID>
+                </e>
+            </rdf:Description>
+        </rdf:RDF>
+    </x:xmpmeta>
+</o>
+```
+
+
+AutoExpand
+-------
+
+This code
+
+```java
+XMLSerializer serializer = new XMLSerializer();
+serializer.setTypeHintsEnabled(false);
+serializer.setPerformAutoExpansion(true);
+
+JSON jsonRepresentation = serializer.readFromFile( "file.xml" );
+
+String xml = serializer.write( jsonRepresentation );
+System.out.writeToReadme(xml)
+```
+
+will render:
+
+```xml
+<o DOMVersion="8.0" Self="d">
+<x:xmpmeta xmptk="Adobe XMP Core 5.3-c011 66.145661, 2012/02/06-14:56:27" xmlns:x="adobe:ns:meta/">
+    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+        <rdf:Description about="" xmlns:dc="http://purl.org/dc/elements/1.1/">
+            <dc:format>application/x-indesign</dc:format>
+        </rdf:Description>
+        <rdf:Description about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">
+            <xmp:CreatorTool>Adobe InDesign CS6 (Macintosh)</xmp:CreatorTool>
+        </rdf:Description>
+        <rdf:Description about="" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
+            <xmpMM:InstanceID>xmp.iid:D093CC710A2068118083AFA2F0AAE3ED</xmpMM:InstanceID>
+        </rdf:Description>
+    </rdf:RDF>
+</x:xmpmeta>
+</o>
+```

main/plugins/org.talend.designer.components.libs/libs_src/json-lib-talend/pom.xml

@@ -0,0 +1,371 @@
+<project
+   xmlns="http://maven.apache.org/POM/4.0.0"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>net.sf.json-lib</groupId>
+   <artifactId>json-lib</artifactId>
+   <packaging>jar</packaging>
+   <version>2.4.1-talend</version>
+   <name>json-lib</name>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
+	</properties>
+
+   <url>http://json-lib.sourceforge.net</url>
+
+   <description>
+      Java library for transforming beans, maps, collections, java
+      arrays and XML to JSON.
+   </description>
+
+   <inceptionYear>2006</inceptionYear>
+   <licenses>
+      <license>
+         <name>The Apache Software License, Version 2.0</name>
+         <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+         <distribution>repo</distribution>
+         <comments>
+            This product includes software developed by Douglas
+            Crockford (http://www.crockford.com).
+         </comments>
+      </license>
+   </licenses>
+   <organization>
+      <name>Json-lib</name>
+      <url>http://json-lib.sourceforge.net</url>
+   </organization>
+
+   <scm>
+      <connection>
+         git://github.com/aalmiray/Json-lib.git
+      </connection>
+      <url>git://github.com/aalmiray/Json-lib.git</url>
+      <developerConnection>
+         git@github.com:aalmiray/Json-lib.git
+      </developerConnection>
+   </scm>
+   <issueManagement>
+      <system>SourceForge</system>
+      <url>https://sourceforge.net/tracker/?group_id=171425</url>
+   </issueManagement>
+
+   <mailingLists>
+      <mailingList>
+         <name>Json-lib User List</name>
+         <subscribe>
+            http://lists.sourceforge.net/lists/listinfo/json-lib-user
+         </subscribe>
+         <unsubscribe>
+            http://lists.sourceforge.net/lists/listinfo/json-lib-user
+         </unsubscribe>
+         <archive>
+            http://sourceforge.net/mailarchive/forum.php?forum=json-lib-user
+         </archive>
+      </mailingList>
+   </mailingLists>
+
+   <developers>
+      <developer>
+         <name>Douglas Crockford</name>
+         <email>json at JSON.org</email>
+         <organization>JSON.org</organization>
+         <roles>
+            <role>Original source code developer</role>
+         </roles>
+      </developer>
+      <developer>
+         <name>Andres Almiray</name>
+         <id>aalmiray</id>
+         <email>aalmiray@users.sourceforge.net</email>
+         <timezone>-5</timezone>
+         <roles>
+            <role>Java Developer</role>
+         </roles>
+      </developer>
+   </developers>
+
+   <contributors>
+      <contributor>
+         <name>Matt Small</name>
+         <organization>WaveMaker</organization>
+         <roles>
+            <role>Contributed generics support</role>
+         </roles>
+      </contributor>
+      <contributor>
+         <name>Dan Fabulich</name>
+         <roles>
+            <role>Feedback on JDK5 and JEE features</role>
+         </roles>
+      </contributor>
+      <contributor>
+         <name>Masato Nagai</name>
+         <roles>
+            <role>Patch for XMLSerializer</role>
+         </roles>
+      </contributor>
+      <contributor>
+         <name>Gino Miceli</name>
+         <roles>
+            <role>Patch for PropertySet strategy</role>
+         </roles>
+      </contributor>
+      <contributor>
+         <name>Mino Tonga</name>
+      </contributor>
+      <contributor>
+         <name>Yee_Keat Phuah</name>
+         <roles>
+            <role>Patch for thread safety in JSONObject/JSONArray</role>
+         </roles>
+      </contributor>
+      <contributor>
+         <name>Oliver Zyngier</name>
+      </contributor>
+      <contributor>
+         <name>Marcelo Liberato</name>
+      </contributor>
+      <contributor>
+         <name>Mathias Herberst</name>
+      </contributor>
+      <contributor>
+         <name>Ales Novy</name>
+         <roles>
+            <role>Patch for performance improvements in JSONUtils</role>
+            <role>Patch for propagating JsonConfig to missing methods on JSONObject</role>
+         </roles>
+      </contributor>
+      <contributor>
+         <name>Peter Schubert</name>
+         <roles>
+            <role>Performance patch for JSONUtils</role>
+         </roles>
+      </contributor>      
+      <contributor>
+         <name>Ian Wolfcat Atha</name>
+         <roles>
+            <role>Performance patch for JSONUtils</role>
+         </roles>
+      </contributor>
+   </contributors>
+
+   <dependencies>
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <version>3.8.2</version>
+         <scope>compile</scope>
+         <optional>true</optional>
+      </dependency>
+      <dependency>
+         <groupId>xmlunit</groupId>
+         <artifactId>xmlunit</artifactId>
+         <version>1.0</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>commons-beanutils</groupId>
+         <artifactId>commons-beanutils</artifactId>
+         <version>1.8.0</version>
+         <scope>compile</scope>
+      </dependency>
+      <dependency>
+         <groupId>commons-collections</groupId>
+         <artifactId>commons-collections</artifactId>
+         <version>3.2.1</version>
+         <scope>compile</scope>
+      </dependency>
+      <dependency>
+         <groupId>commons-lang</groupId>
+         <artifactId>commons-lang</artifactId>
+         <version>2.5</version>
+         <scope>compile</scope>
+      </dependency>
+      <dependency>
+         <groupId>commons-logging</groupId>
+         <artifactId>commons-logging</artifactId>
+         <version>1.1.1</version>
+         <scope>compile</scope>
+         <exclusions>
+            <exclusion>
+               <groupId>log4j</groupId>
+               <artifactId>log4j</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>logkit</groupId>
+               <artifactId>logkit</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>avalon-framework</groupId>
+               <artifactId>avalon-framework</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>javax.servlet</groupId>
+               <artifactId>servlet-api</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>
+      <dependency>
+         <groupId>xom</groupId>
+         <artifactId>xom</artifactId>
+         <version>1.1</version>
+         <scope>compile</scope>
+         <optional>true</optional>
+      </dependency>
+      <dependency>
+         <groupId>oro</groupId>
+         <artifactId>oro</artifactId>
+         <version>2.0.8</version>
+         <scope>compile</scope>
+         <optional>true</optional>
+      </dependency>
+      <dependency>
+         <groupId>net.sf.ezmorph</groupId>
+         <artifactId>ezmorph</artifactId>
+         <version>1.0.6</version>
+         <scope>compile</scope>
+      </dependency>
+      <dependency>
+         <groupId>log4j</groupId>
+         <artifactId>log4j</artifactId>
+         <version>1.2.14</version>
+         <scope>runtime</scope>
+         <optional>true</optional>
+      </dependency>
+      <dependency>
+         <groupId>commons-httpclient</groupId>
+         <artifactId>commons-httpclient</artifactId>
+         <version>3.1</version>
+         <scope>test</scope>
+      </dependency>
+   </dependencies>
+
+   <prerequisites>
+      <maven>3.0.1</maven>
+   </prerequisites>
+
+   <build>
+      <defaultGoal>install</defaultGoal>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-site-plugin</artifactId>
+            <configuration>
+               <templateDirectory>
+                  ${basedir}/src/site
+               </templateDirectory>
+               <template>site.vm</template>
+            </configuration>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.3</version>
+            <configuration>
+               <excludes>
+                  <exclude>**/Abstract*.java</exclude>
+                  <exclude>**/AllTests.java</exclude>
+                  <exclude>**/*closure*</exclude>
+               </excludes>
+               <includes>
+                  <include>**/Test*.java</include>
+               </includes>
+            </configuration>
+         </plugin>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-compiler-plugin</artifactId>
+              <configuration>
+                  <source>1.8</source>
+                  <target>1.8</target>
+              </configuration>
+          </plugin>
+      </plugins>
+   </build>
+
+   <reporting>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-project-info-reports-plugin</artifactId>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-report-plugin</artifactId>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jxr-plugin</artifactId>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.1</version>
+            <configuration>
+               <links>
+                  <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+                  <link>http://www.junit.org/junit/javadoc/</link>
+                  <link>
+                     http://jakarta.apache.org/commons/beanutils/commons-beanutils-1.7.0/docs/api/
+                  </link>
+                  <link>
+                     http://jakarta.apache.org/commons/lang/api-2.2/
+                  </link>
+                  <link>http://ezmorph.sourceforge.net/apidocs/</link>
+               </links>
+            </configuration>
+         </plugin>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>cobertura-maven-plugin</artifactId>
+         </plugin>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>changes-maven-plugin</artifactId>
+            <reportSets>
+               <reportSet>
+                  <reports>
+                     <report>changes-report</report>
+                  </reports>
+               </reportSet>
+            </reportSets>
+         </plugin>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>jdepend-maven-plugin</artifactId>
+         </plugin>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>javancss-maven-plugin</artifactId>
+            <version>2.0-beta-1</version>
+         </plugin>
+      </plugins>
+   </reporting>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>talend_nexus_deployment</id>
+            <url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </snapshotRepository>
+        <repository>
+            <id>talend_nexus_deployment</id>
+            <url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </distributionManagement>
+</project>

main/plugins/org.talend.designer.components.libs/libs_src/json-lib-talend/src/main/java/net/sf/json/AbstractJSON.java

@@ -0,0 +1,336 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.sf.json;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.lang.ref.SoftReference;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
+
+import net.sf.json.util.JSONUtils;
+import net.sf.json.util.JsonEventListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Base class for JSONObject and JSONArray.
+ *
+ * @author Andres Almiray <aalmiray@users.sourceforge.net>
+ */
+abstract class AbstractJSON implements JSON {
+   private static class CycleSet extends ThreadLocal {
+      protected Object initialValue() {
+         return new SoftReference(new HashSet());
+      }
+
+      public Set getSet() {
+         Set set = (Set) ((SoftReference)get()).get();
+         if( set == null ) {
+             set = new HashSet();
+             set(new SoftReference(set));
+         }
+         return set;
+      }
+   }
+   
+   private static CycleSet cycleSet = new CycleSet();
+
+   private static final Log log = LogFactory.getLog( AbstractJSON.class );
+
+   /**
+    * Adds a reference for cycle detection check.
+    *
+    * @param instance the reference to add
+    * @return true if the instance has not been added previously, false
+    *        otherwise.
+    */
+   protected static boolean addInstance( Object instance ) {
+      return getCycleSet().add( instance );
+   }
+
+   /**
+    * Fires an end of array event.
+    */
+   protected static void fireArrayEndEvent( JsonConfig jsonConfig ) {
+      if( jsonConfig.isEventTriggeringEnabled() ){
+         for( Iterator listeners = jsonConfig.getJsonEventListeners()
+               .iterator(); listeners.hasNext(); ){
+            JsonEventListener listener = (JsonEventListener) listeners.next();
+            try{
+               listener.onArrayEnd();
+            }catch( RuntimeException e ){
+               log.warn( e );
+            }
+         }
+      }
+   }
+
+   /**
+    * Fires a start of array event.
+    */
+   protected static void fireArrayStartEvent( JsonConfig jsonConfig ) {
+      if( jsonConfig.isEventTriggeringEnabled() ){
+         for( Iterator listeners = jsonConfig.getJsonEventListeners()
+               .iterator(); listeners.hasNext(); ){
+            JsonEventListener listener = (JsonEventListener) listeners.next();
+            try{
+               listener.onArrayStart();
+            }catch( RuntimeException e ){
+               log.warn( e );
+            }
+         }
+      }
+   }
+
+   /**
+    * Fires an element added event.
+    *
+    * @param index the index where the element was added
+    * @param element the added element
+    */
+   protected static void fireElementAddedEvent( int index, Object element, JsonConfig jsonConfig ) {
+      if( jsonConfig.isEventTriggeringEnabled() ){
+         for( Iterator listeners = jsonConfig.getJsonEventListeners()
+               .iterator(); listeners.hasNext(); ){
+            JsonEventListener listener = (JsonEventListener) listeners.next();
+            try{
+               listener.onElementAdded( index, element );
+            }catch( RuntimeException e ){
+               log.warn( e );
+            }
+         }
+      }
+   }
+
+   /**
+    * Fires an error event.
+    *
+    * @param jsone the thrown exception
+    */
+   protected static void fireErrorEvent( JSONException jsone, JsonConfig jsonConfig ) {
+      if( jsonConfig.isEventTriggeringEnabled() ){
+         for( Iterator listeners = jsonConfig.getJsonEventListeners()
+               .iterator(); listeners.hasNext(); ){
+            JsonEventListener listener = (JsonEventListener) listeners.next();
+            try{
+               listener.onError( jsone );
+            }catch( RuntimeException e ){
+               log.warn( e );
+            }
+         }
+      }
+   }
+
+   /**
+    * Fires an end of object event.
+    */
+   protected static void fireObjectEndEvent( JsonConfig jsonConfig ) {
+      if( jsonConfig.isEventTriggeringEnabled() ){
+         for( Iterator listeners = jsonConfig.getJsonEventListeners()
+               .iterator(); listeners.hasNext(); ){
+            JsonEventListener listener = (JsonEventListener) listeners.next();
+            try{
+               listener.onObjectEnd();
+            }catch( RuntimeException e ){
+               log.warn( e );
+            }
+         }
+      }
+   }
+
+   /**
+    * Fires a start of object event.
+    */
+   protected static void fireObjectStartEvent( JsonConfig jsonConfig ) {
+      if( jsonConfig.isEventTriggeringEnabled() ){
+         for( Iterator listeners = jsonConfig.getJsonEventListeners()
+               .iterator(); listeners.hasNext(); ){
+            JsonEventListener listener = (JsonEventListener) listeners.next();
+            try{
+               listener.onObjectStart();
+            }catch( RuntimeException e ){
+               log.warn( e );
+            }
+         }
+      }
+   }
+
+   /**
+    * Fires a property set event.
+    *
+    * @param key the name of the property
+    * @param value the value of the property
+    * @param accumulated if the value has been accumulated over 'key'
+    */
+   protected static void firePropertySetEvent( String key, Object value, boolean accumulated,
+         JsonConfig jsonConfig ) {
+      if( jsonConfig.isEventTriggeringEnabled() ){
+         for( Iterator listeners = jsonConfig.getJsonEventListeners()
+               .iterator(); listeners.hasNext(); ){
+            JsonEventListener listener = (JsonEventListener) listeners.next();
+            try{
+               listener.onPropertySet( key, value, accumulated );
+            }catch( RuntimeException e ){
+               log.warn( e );
+            }
+         }
+      }
+   }
+
+   /**
+    * Fires a warning event.
+    *
+    * @param warning the warning message
+    */
+   protected static void fireWarnEvent( String warning, JsonConfig jsonConfig ) {
+      if( jsonConfig.isEventTriggeringEnabled() ){
+         for( Iterator listeners = jsonConfig.getJsonEventListeners()
+               .iterator(); listeners.hasNext(); ){
+            JsonEventListener listener = (JsonEventListener) listeners.next();
+            try{
+               listener.onWarning( warning );
+            }catch( RuntimeException e ){
+               log.warn( e );
+            }
+         }
+      }
+   }
+
+   /**
+    * Removes a reference for cycle detection check.
+    */
+   protected static void removeInstance( Object instance ) {
+      Set set = getCycleSet();
+      set.remove( instance );
+      if(set.size() == 0) {
+          cycleSet.remove();
+      }
+   }
+
+   protected Object _processValue( Object value, JsonConfig jsonConfig ) {
+      if( JSONNull.getInstance().equals( value ) ) {
+         return JSONNull.getInstance();
+      } else if( Class.class.isAssignableFrom( value.getClass() ) || value instanceof Class ) {
+         return ((Class) value).getName();
+      } else if( JSONUtils.isFunction( value ) ) {
+         if( value instanceof String ) {
+            value = JSONFunction.parse( (String) value );
+         }
+         return value;
+      } else if( value instanceof JSONString ) {
+         return JSONSerializer.toJSON( (JSONString) value, jsonConfig );
+      } else if( value instanceof JSON ) {
+         return JSONSerializer.toJSON( value, jsonConfig );
+      } else if( JSONUtils.isArray( value ) ) {
+         return JSONArray.fromObject( value, jsonConfig );
+      } else if( JSONUtils.isString( value ) ) {
+         String str = String.valueOf( value );
+         if( JSONUtils.hasQuotes( str ) ){
+            String stripped = JSONUtils.stripQuotes( str );
+            if( JSONUtils.isFunction( stripped )){
+               return JSONUtils.DOUBLE_QUOTE + stripped + JSONUtils.DOUBLE_QUOTE;
+            }
+            if(stripped.startsWith("[") && stripped.endsWith("]")) {
+               return stripped;
+            }
+            if(stripped.startsWith("{") && stripped.endsWith("}")) {
+               return stripped;
+            }
+            return str;
+         } else if( JSONUtils.isJsonKeyword( str, jsonConfig ) ) {
+            if( jsonConfig.isJavascriptCompliant() && "undefined".equals( str )){
+               return JSONNull.getInstance();
+            }
+            return str;
+         } else if( JSONUtils.mayBeJSON( str ) ) {
+            try {
+               return JSONSerializer.toJSON( str, jsonConfig );
+            } catch( JSONException jsone ) {
+               return str;
+            }
+         }
+         return str;
+      } else if( JSONUtils.isNumber( value ) ) {
+         JSONUtils.testValidity( value );
+         return JSONUtils.transformNumber( (Number) value );
+      } else if( JSONUtils.isBoolean( value ) ) {
+         return value;
+      } else {
+         JSONObject jsonObject = JSONObject.fromObject( value, jsonConfig );
+         if( jsonObject.isNullObject() ) {
+            return JSONNull.getInstance();
+         } else {
+            return jsonObject;
+         }
+      }
+   }
+   
+   private static Set getCycleSet() {
+      return cycleSet.getSet();
+   }
+
+    public final Writer write(Writer writer) throws IOException {
+        write(writer,NORMAL);
+        return writer;
+    }
+
+    public final Writer writeCanonical(Writer writer) throws IOException {
+        write(writer,CANONICAL);
+        return writer;
+    }
+
+    protected abstract void write(Writer w, WritingVisitor v) throws IOException;
+
+    interface WritingVisitor {
+        Collection keySet(JSONObject o);
+        void on(JSON o, Writer w) throws IOException;
+        void on(Object value, Writer w) throws IOException;
+    }
+
+    private static final WritingVisitor NORMAL = new WritingVisitor() {
+        public Collection keySet(JSONObject o) {
+            return o.keySet();
+        }
+
+        public void on(JSON o, Writer w) throws IOException {
+            o.write(w);
+        }
+
+        public void on(Object value, Writer w) throws IOException {
+            w.write(JSONUtils.valueToString(value));
+        }
+    };
+
+    private static final WritingVisitor CANONICAL = new WritingVisitor() {
+        public Collection keySet(JSONObject o) {
+            return new TreeSet(o.keySet()); // sort them alphabetically
+        }
+
+        public void on(JSON o, Writer w) throws IOException {
+            o.writeCanonical(w);
+        }
+
+        public void on(Object value, Writer w) throws IOException {
+            w.write(JSONUtils.valueToCanonicalString(value));
+        }
+    };
+}