temp patch

CONTRIBUTORS.md

@@ -7,5 +7,4 @@ Huge thanks to these people who contributed in making Talend product better:
  - [overpackaging](https://github.com/overpackaging) (Steeve Dreux)
  - [brazabr](https://github.com/brazabr) (Thiago Benvenuto)
  - [phoflack](https://jira.talendforge.org/secure/ViewProfile.jspa?name=phoflack) (Philip Hoflack)
- - [bgunics-talend](https://github.com/bgunics-talend) (Balasz Gunics)
- - [cflamain](https://github.com/cflamain) (Christophe Flamain)
+ - [bgunics-talend](https://github.com/bgunics-talend) (Balasz Gunics)

SECURITY.md

@@ -1,14 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 8.0.x   | :white_check_mark: |
-| 7.3.x   | :white_check_mark: |
-| < 7.3.x | :x:                |
-
-## Reporting a Vulnerability
-
-For information on how to report a new security problem please see [here](https://www.talend.com/security/vulnerability-disclosure/).
-Our existing security advisories are published [here](https://www.talend.com/security/incident-response/).

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

@@ -10,12 +10,13 @@
   </url>  
   <requires>
     <import feature="org.eclipse.gef" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.talend.m2e.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.m2e.feature" version="0.0.0" match="greaterOrEqual"/>
     <import feature="org.eclipse.equinox.p2.discovery.feature" version="0.0.0" match="greaterOrEqual"/>
     <import feature="org.talend.utils.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="javax.xml.rpc-api" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="javax.xml.rpc" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="net.jeeeyul.eclipse.themes" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="net.jeeeyul.swtend" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.apache.axis" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.gmf.runtime.draw2d.ui" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.gmf.runtime.common.core" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.gmf.runtime.common.ui" version="0.0.0" match="greaterOrEqual"/>
@@ -32,5 +33,4 @@
   <plugin id="org.talend.libraries.mozilla" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.sqlbuilder" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.sqlbuilder" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.core.swt" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
 </feature>

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

@@ -17,15 +17,415 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.gmf.runtime.notation" version="0.0.0"/>
-      <import feature="org.eclipse.gef" version="0.0.0"/>
-      <import feature="org.eclipse.emf.common" version="0.0.0"/>
-      <import feature="org.eclipse.emf.ecore" version="0.0.0"/>
-      <import feature="org.eclipse.emf.ecore.edit" version="0.0.0"/>
-      <import feature="org.eclipse.emf.edit" version="0.0.0"/>
-      <import feature="org.eclipse.emf.transaction" version="0.0.0"/>
-      <import feature="org.eclipse.emf.validation" version="0.0.0"/>
-      <import feature="org.eclipse.emf.workspace" version="0.0.0"/>
+      <import feature="org.eclipse.gmf.runtime.notation" version="1.8.0"/>
+      <import feature="org.eclipse.gef" version="3.9.2"/>
+      <import feature="org.eclipse.emf.common" version="2.10.0"/>
+      <import feature="org.eclipse.emf.ecore" version="2.10.0"/>
+      <import feature="org.eclipse.emf.ecore.edit" version="2.8.0"/>
+      <import feature="org.eclipse.emf.edit" version="2.10.0"/>
+      <import feature="org.eclipse.emf.transaction" version="1.8.0"/>
+      <import feature="org.eclipse.emf.validation" version="1.8.0"/>
+      <import feature="org.eclipse.emf.workspace" version="1.8.0"/>
    </requires>
 
+   <plugin
+         id="org.eclipse.gmf.runtime.common.core"
+         download-size="117"
+         install-size="226"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui"
+         download-size="257"
+         install-size="509"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.action"
+         download-size="101"
+         install-size="173"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.action.ide"
+         download-size="39"
+         install-size="66"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.services"
+         download-size="100"
+         install-size="208"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.services.action"
+         download-size="120"
+         install-size="293"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.services.dnd"
+         download-size="92"
+         install-size="190"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.services.dnd.ide"
+         download-size="24"
+         install-size="38"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.services.properties"
+         download-size="76"
+         install-size="146"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.core"
+         download-size="133"
+         install-size="284"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui"
+         download-size="1190"
+         install-size="2486"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.actions"
+         download-size="218"
+         install-size="391"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.dnd"
+         download-size="19"
+         install-size="29"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.geoshapes"
+         download-size="99"
+         install-size="179"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.properties"
+         download-size="215"
+         install-size="430"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.providers"
+         download-size="137"
+         install-size="318"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.providers.ide"
+         download-size="23"
+         install-size="38"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.render"
+         download-size="117"
+         install-size="236"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.resources.editor"
+         download-size="123"
+         install-size="251"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide"
+         download-size="69"
+         install-size="146"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.draw2d.ui"
+         download-size="318"
+         install-size="619"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.draw2d.ui.render"
+         download-size="49"
+         install-size="87"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.draw2d.ui.render.awt"
+         download-size="196"
+         install-size="396"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.emf.clipboard.core"
+         download-size="110"
+         install-size="223"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.emf.commands.core"
+         download-size="28"
+         install-size="48"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.emf.core"
+         download-size="114"
+         install-size="229"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.emf.type.core"
+         download-size="190"
+         install-size="439"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.emf.type.ui"
+         download-size="18"
+         install-size="25"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.emf.ui"
+         download-size="93"
+         install-size="177"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.emf.ui.properties"
+         download-size="62"
+         install-size="118"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.gef.ui"
+         download-size="101"
+         install-size="182"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.notation.providers"
+         download-size="29"
+         install-size="53"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf"
+         download-size="13"
+         install-size="17"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.printing"
+         download-size="14"
+         install-size="19"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.printing.win32"
+         download-size="752"
+         install-size="3091"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.printing"
+         download-size="90"
+         install-size="172"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.printing.render"
+         download-size="92"
+         install-size="196"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.dom.svg"
+         download-size="453"
+         install-size="1509"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.bridge"
+         download-size="504"
+         install-size="1013"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.dom"
+         download-size="107"
+         install-size="203"
+         version="1.6.1.v201505192100"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.ext.awt"
+         download-size="387"
+         install-size="760"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.transcoder"
+         download-size="79"
+         install-size="151"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.svggen"
+         download-size="183"
+         install-size="338"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.util"
+         download-size="99"
+         install-size="192"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.w3c.dom.svg"
+         download-size="95"
+         install-size="140"
+         version="1.1.0.v201011041433"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.xerces"
+         download-size="0"
+         install-size="0"
+         version="2.12.1.v20210115-0812"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.xml.resolver"
+         download-size="94"
+         install-size="201"
+         version="1.2.0.v201005080400"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.css"
+         download-size="259"
+         install-size="512"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.util.gui"
+         download-size="161"
+         install-size="281"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.parser"
+         download-size="54"
+         install-size="112"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.xml"
+         download-size="35"
+         install-size="92"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.w3c.css.sac"
+         download-size="37"
+         install-size="65"
+         version="1.3.1.v200903091627"
+         unpack="false"/>
+
+   <plugin
+         id="org.w3c.dom.smil"
+         download-size="19"
+         install-size="37"
+         version="1.0.1.v200903091627"
+         unpack="false"/>
+
+   <plugin
+         id="javax.xml"
+         download-size="246"
+         install-size="413"
+         version="1.3.4.v201005080400"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.xml.serializer"
+         download-size="286"
+         install-size="577"
+         version="2.7.1.v201005080400"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.pdf"
+         download-size="498"
+         install-size="989"
+         version="1.6.0.v201105071520"
+         unpack="false"/>
+
+   <plugin
+         id="org.w3c.dom.events"
+         download-size="17"
+         install-size="26"
+         version="3.0.0.draft20060413_v201105210656"
+         unpack="false"/>
+
 </feature>

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

@@ -16,7 +16,6 @@
     <import plugin="org.talend.repository" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.talend.utils" version="0.0.0" match="greaterOrEqual"/>
   </requires>  
-  <plugin id="org.talend.common.ui.runtime.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.commons.runtime.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.commons.ui.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.core.repository.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
@@ -44,14 +43,12 @@
   <plugin id="org.talend.migrationTool.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"/>
   <plugin id="org.talend.repository.generic.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.json.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.items.importexport.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.items.importexport.ui.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.localprovider.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.metadata.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.sqlbuilder.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.presentation.onboarding.resource.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.view.di.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.testutils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>

main/features/org.talend.studio.components.tck.jdbc.feature/.project

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.talend.studio.components.tck.jdbc.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

main/features/org.talend.studio.components.tck.jdbc.feature/feature.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.studio.components.tck.jdbc.feature"
-      label="JDBC"
-      version="8.8.8.qualifier">
-
-   <description url="http://www.example.com/description">
-      JDBC
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      JDBC
-Copyright (c) 2006-2021 Talend Inc. - www.talend.com
-All rights reserved.
-
-This product includes software developed at
-GlassFish Community (https://glassfish.dev.java.net)
-Licensed under the CDDL,GPL-2.0-only license.
-
-
-This product includes software developed at
-The Apache Software Foundation (http://jakarta.apache.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML
-Licensed under the Apache-2.0 license.
-   </license>
-
-   <requires>
-      <import plugin="org.talend.designer.maven.repo.tck"/>
-      <import plugin="org.talend.studio.components.tck.jdbc"/>
-      <import plugin="org.talend.components.jdbc.definition"/>
-   </requires>
-
-</feature>

main/features/org.talend.studio.components.tck.jdbc.feature/pom.xml

@@ -1,12 +0,0 @@
-<?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>8.8.8-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tck.jdbc.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>

main/features/org.talend.studio.components.tck.jira.feature/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.talend.studio.components.tck.jira.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.studio.components.tck.jira.feature/build.properties

@@ -1,2 +0,0 @@
-bin.includes = feature.xml,\
-               p2.inf

main/features/org.talend.studio.components.tck.jira.feature/feature.xml

@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.studio.components.tck.jira.feature"
-      label="Jira"
-      version="8.8.8.qualifier">
-
-   <description url="http://www.example.com/description">
-      Jira component
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      Jira component
-Copyright (c) 2006-2021 Talend Inc. - www.talend.com
-All rights reserved.
-
-This product includes software developed at
-OPS4J - Open Participation Software for Java
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-GlassFish Community (https://glassfish.dev.java.net)
-Licensed under the CDDL,GPL-2.0-only license.
-
-
-This product includes software developed at
-The Apache Software Foundation (http://jakarta.apache.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-OSGi Alliance (http://www.osgi.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Joda.org (http://www.joda.org)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML (http://fasterxml.com)
-Licensed under the JSON license.
-
-
-This product includes software developed at
-Google, Inc.
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-AddThis
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the MIT license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the X11 license.
-
-
-This product includes software developed at
-JUnit
-Licensed under the EPL-1.0 license.
-
-
-This product includes software developed at
-Seam Framework
-Licensed under the Apache-2.0 license.
-   </license>
-
-   <requires>
-      <import plugin="org.talend.designer.maven.repo.tck" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.talend.designer.maven.repo.tcksdk" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.talend.studio.components.tck.jira"/>
-   </requires>
-
-</feature>

main/features/org.talend.studio.components.tck.jira.feature/p2.inf

@@ -1,4 +0,0 @@
-properties.0.name=TALEND_COMPONENT_tJIRAInput
-properties.0.value=
-properties.1.name=TALEND_COMPONENT_tJIRAOutput
-properties.1.value=

main/features/org.talend.studio.components.tck.jira.feature/pom.xml

@@ -1,12 +0,0 @@
-<?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>8.8.8-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tck.jira.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>

main/features/org.talend.studio.components.tck.splunk.feature/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.talend.studio.components.tck.splunk.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.studio.components.tck.splunk.feature/build.properties

@@ -1,2 +0,0 @@
-bin.includes = feature.xml,\
-               p2.inf

main/features/org.talend.studio.components.tck.splunk.feature/feature.xml

@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.studio.components.tck.splunk.feature"
-      label="Splunk"
-      version="8.8.8.qualifier">
-
-   <description url="http://www.example.com/description">
-      Splunk component
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      Splunk component
-Copyright (c) 2006-2021 Talend Inc. - www.talend.com
-All rights reserved.
-
-This product includes software developed at
-OPS4J - Open Participation Software for Java
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-GlassFish Community (https://glassfish.dev.java.net)
-Licensed under the CDDL,GPL-2.0-only license.
-
-
-This product includes software developed at
-The Apache Software Foundation (http://jakarta.apache.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-OSGi Alliance (http://www.osgi.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Joda.org (http://www.joda.org)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML (http://fasterxml.com)
-Licensed under the JSON license.
-
-
-This product includes software developed at
-Google, Inc.
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-AddThis
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the MIT license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the X11 license.
-
-
-This product includes software developed at
-JUnit
-Licensed under the EPL-1.0 license.
-
-
-This product includes software developed at
-Seam Framework
-Licensed under the Apache-2.0 license.
-   </license>
-
-   <requires>
-      <import plugin="org.talend.designer.maven.repo.tck" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.talend.designer.maven.repo.tcksdk" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.talend.studio.components.tck.splunk"/>
-   </requires>
-
-</feature>

main/features/org.talend.studio.components.tck.splunk.feature/p2.inf

@@ -1,2 +0,0 @@
-properties.0.name=TALEND_COMPONENT_tSplunkEventCollector
-properties.0.value=

main/features/org.talend.studio.components.tck.splunk.feature/pom.xml

@@ -1,12 +0,0 @@
-<?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>8.8.8-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tck.splunk.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>

main/features/org.talend.studio.components.tcompv0.jdbc.feature/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.studio.components.tcompv0.jdbc.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

main/features/org.talend.studio.components.tcompv0.jdbc.feature/feature.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.studio.components.tcompv0.jdbc.feature"
+      label="JDBC_feature"
+      version="8.8.8.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>
+   <plugin
+         id="org.talend.studio.components.tcompv0.jdbc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.components.jdbc.definition"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

main/features/org.talend.studio.components.tcompv0.jdbc.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>8.8.8-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.jdbc.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.jira.feature/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.studio.components.tcompv0.jira.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

main/features/org.talend.studio.components.tcompv0.jira.feature/build.properties

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

main/features/org.talend.studio.components.tcompv0.jira.feature/feature.xml

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.studio.components.tcompv0.jira.feature"
+      label="Jira"
+      version="8.8.8.qualifier">
+
+   <description url="http://www.example.com/description">
+      Jira component
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      Jira component
+Copyright (c) 2006-2021 Talend Inc. - www.talend.com
+All rights reserved.
+
+This product includes software developed at
+OPS4J - Open Participation Software for Java
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+GlassFish Community (https://glassfish.dev.java.net)
+Licensed under the CDDL,GPL-2.0-only license.
+
+
+This product includes software developed at
+The Apache Software Foundation (http://jakarta.apache.org/)
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+FasterXML
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+OSGi Alliance (http://www.osgi.org/)
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+Joda.org (http://www.joda.org)
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+FasterXML (http://fasterxml.com)
+Licensed under the JSON license.
+
+
+This product includes software developed at
+Google, Inc.
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+AddThis
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+SLF4J.ORG
+Licensed under the MIT license.
+
+
+This product includes software developed at
+SLF4J.ORG
+Licensed under the X11 license.
+
+
+This product includes software developed at
+JUnit
+Licensed under the EPL-1.0 license.
+
+
+This product includes software developed at
+Seam Framework
+Licensed under the Apache-2.0 license.
+   </license>
+
+   <requires>
+      <import plugin="org.talend.designer.maven.repo.tcompv0" version="0.0.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.talend.studio.components.tcompv0.jira"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.components.jira"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

main/features/org.talend.studio.components.tcompv0.jira.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>8.8.8-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.jira.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.splunk.feature/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.studio.components.tcompv0.splunk.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

main/features/org.talend.studio.components.tcompv0.splunk.feature/build.properties

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

main/features/org.talend.studio.components.tcompv0.splunk.feature/feature.xml

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.studio.components.tcompv0.splunk.feature"
+      label="Splunk"
+      version="8.8.8.qualifier">
+
+   <description url="http://www.example.com/description">
+      Splunk component
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      Splunk component
+Copyright (c) 2006-2021 Talend Inc. - www.talend.com
+All rights reserved.
+
+This product includes software developed at
+OPS4J - Open Participation Software for Java
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+GlassFish Community (https://glassfish.dev.java.net)
+Licensed under the CDDL,GPL-2.0-only license.
+
+
+This product includes software developed at
+The Apache Software Foundation (http://jakarta.apache.org/)
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+FasterXML
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+OSGi Alliance (http://www.osgi.org/)
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+Joda.org (http://www.joda.org)
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+FasterXML (http://fasterxml.com)
+Licensed under the JSON license.
+
+
+This product includes software developed at
+Google, Inc.
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+AddThis
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+SLF4J.ORG
+Licensed under the MIT license.
+
+
+This product includes software developed at
+SLF4J.ORG
+Licensed under the X11 license.
+
+
+This product includes software developed at
+JUnit
+Licensed under the EPL-1.0 license.
+
+
+This product includes software developed at
+Seam Framework
+Licensed under the Apache-2.0 license.
+   </license>
+
+   <requires>
+      <import plugin="org.talend.designer.maven.repo.tcompv0" version="0.0.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.talend.studio.components.tcompv0.splunk"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.components.splunk"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

main/features/org.talend.studio.components.tcompv0.splunk.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>8.8.8-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.splunk.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -17,13 +17,14 @@
    </license>
 
    <requires>
-      <import feature="org.talend.studio.components.tck.jira.feature" version="0.0.0" match="greaterOrEqual"/>
-      <import feature="org.talend.studio.components.tck.splunk.feature" version="0.0.0" match="greaterOrEqual"/>
+      <import feature="org.talend.studio.components.tcompv0.jdbc.feature" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.talend.studio.components.tcompv0.netsuite.feature" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.talend.studio.components.tcompv0.googledrive.feature" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.talend.studio.components.tcompv0.marketo.feature" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.talend.studio.components.tcompv0.azurestorage.feature" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.talend.studio.components.tcompv0.snowflake.feature" version="0.0.0" match="greaterOrEqual"/>
+      <import feature="org.talend.studio.components.tcompv0.jira.feature" version="0.0.0" match="greaterOrEqual"/>
+      <import feature="org.talend.studio.components.tcompv0.splunk.feature" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.talend.studio.components.tcompv0.salesforce.feature" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.talend.esb.tooling.ws.consumer.feature" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="biz.aQute.bnd.annotation" version="0.0.0" match="greaterOrEqual"/>
@@ -83,7 +84,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.talend.studio.components.tck.jira"
+         id="org.talend.components.jira"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -118,7 +119,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.talend.studio.components.tck.splunk"
+         id="org.talend.components.splunk"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -138,6 +139,12 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.talend.designer.components.exchange"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
    <plugin
          id="org.talend.designer.components.localprovider"
          download-size="0"
@@ -186,14 +193,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.talend.designer.mapper.swt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.talend.designer.rowgenerator"
          download-size="0"
@@ -250,10 +249,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.talend.studio.components.tck.jdbc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
 </feature>

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

@@ -13,6 +13,9 @@
     <import feature="org.talend.repository.feature" version="0.0.0" match="greaterOrEqual"/>
     <import feature="org.talend.tos.components.feature" version="0.0.0" match="greaterOrEqual"/>
     <import feature="org.talend.updates.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="javax.transaction" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="javax.xml.rpc" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.apache.axis" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.apache.log4j" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.ui" version="0.0.0" match="greaterOrEqual"/>

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

@@ -29,6 +29,8 @@
   <plugin id="org.talend.libraries.ehcache" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.excel" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.groovy" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.libraries.guava" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.libraries.hadoop.mapr.5.0.0" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.jackson" download-size="0" install-size="0" version="0.0.0"/>
   <plugin download-size="0" install-size="0" version="0.0.0" unpack="false" id="org.talend.libraries.javacsv"/>
   <plugin id="org.talend.libraries.jax" download-size="0" install-size="0" version="0.0.0"/>
@@ -44,6 +46,4 @@
   <plugin id="org.talend.libraries.slf4j" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.xml" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.zmq" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.bigquery" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.repository.bigquery" download-size="0" install-size="0" version="0.0.0"/>
 </feature>

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

@@ -13,9 +13,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface,
  org.apache.log4j,
  org.talend.libraries.apache,
- org.talend.components.api,
- org.talend.common.ui.runtime,
- org.talend.commons.runtime
+ org.talend.components.api
 Eclipse-LazyStart: true
 Export-Package: org.talend.designer.abstractmap,
  org.talend.designer.abstractmap.managers,
@@ -29,4 +27,3 @@ Export-Package: org.talend.designer.abstractmap,
  org.talend.designer.abstractmap.ui.visualmap.link,
  org.talend.designer.abstractmap.ui.visualmap.zone
 Bundle-Vendor: .Talend SA.
-Automatic-Module-Name: org.talend.designer.abstractmap

main/plugins/org.talend.designer.abstractmap/src/java/main/messages_ja.properties

@@ -2,7 +2,7 @@ prefs.configuration.title=\u30DE\u30C3\u30D7\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3
 prefs.configuration.LINK_STYLE=\u30C7\u30D5\u30A9\u30EB\u30C8\u30DE\u30C3\u30D4\u30F3\u30B0\u30EA\u30F3\u30AF\u306E\u8868\u793A:
 prefs.configuration.LINK_STYLE.AUTO=\u81EA\u52D5
 prefs.configuration.LINK_STYLE.BEZIER_CURVE=\u66F2\u7DDA
-prefs.configuration.LINK_STYLE.LINE=\u76F4\u7DDA(\u9AD8\u901F)
+prefs.configuration.LINK_STYLE.LINE=\u76F4\u7DDA\uFF08\u9AD8\u901F\uFF09
 DraggingInfosPopup.draggingEntry={0}\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
 DraggingInfosPopup.dropInvalid=\n<< \u7121\u52B9\u306A\u30C9\u30ED\u30C3\u30D7 >>\n
 DraggingInfosPopup.draggingEntries={0}\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002

main/plugins/org.talend.designer.abstractmap/src/java/main/org/talend/designer/abstractmap/managers/AbstractUIManager.java

@@ -13,10 +13,6 @@
 package org.talend.designer.abstractmap.managers;
 
 import org.apache.log4j.Level;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
-import org.talend.commons.ui.runtime.ITalendThemeService;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.designer.abstractmap.ui.dnd.DraggingInfosPopup;
 import org.talend.designer.abstractmap.ui.properties.LINK_STYLE;

main/plugins/org.talend.designer.abstractmap/src/java/main/org/talend/designer/abstractmap/ui/dnd/DraggingInfosPopup.java

@@ -77,7 +77,7 @@ public final class DraggingInfosPopup {
         private Label labelDropInvalid;
 
         public Popup(Shell parent) {
-            super(parent, SWT.ON_TOP, false, false, false, false, false, null, null);
+            super(parent, SWT.ON_TOP, false, false, false, false, null, null);
         }
 
         @Override

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

@@ -13,8 +13,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.talend.core.runtime,
  org.talend.model,
  org.eclipse.jface,
- org.talend.components.api,
- org.talend.common.ui.runtime,
- org.talend.commons.runtime
+ org.talend.components.api
 Eclipse-LazyStart: true
-Automatic-Module-Name: org.talend.designer.alfrescooutput

main/plugins/org.talend.designer.alfrescooutput/src/main/java/messages_ja.properties

@@ -1,4 +1,4 @@
-AlfrescoOutputManager.failedLoadModel=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30E1\u30BF\u30C7\u30FC\u30BF\u304B\u3089\u30E2\u30C7\u30EB\u30ED\u30FC\u30C9\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u518D\u521D\u671F\u5316\u4E2D
+AlfrescoOutputManager.failedLoadModel=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30E1\u30BF\u30C7\u30FC\u30BF\u304B\u3089\u30E2\u30C7\u30EB\u30ED\u30FC\u30C9\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u518D\u521D\u671F\u5316\u4E2D,
 AlfrescoOutputManager.schemaError.title=\u30B9\u30AD\u30FC\u30DE\u306E\u30A8\u30E9\u30FC
 AlfrescoOutputManager.schemaError.msg=\u6700\u521D\u306B\u30B9\u30AD\u30FC\u30DE\u3092\u540C\u671F\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 AlfrescoOutputModelManager.alreadyAdded=\u3053\u306E\u30E2\u30C7\u30EB\u306F\u65E2\u306B\u8FFD\u52A0\u6E08\u307F\u3067\u3059\u3002

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

@@ -24,14 +24,7 @@ Require-Bundle: org.talend.core.repository,
  org.talend.daikon,
  org.talend.daikon.crypto.utils,
  org.talend.designer.core.generic,
- org.talend.updates.runtime,
- org.talend.commons.runtime,
- org.eclipse.equinox.common,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.talend.common.ui.runtime,
- org.eclipse.jface,
- org.talend.core.runtime
+ org.talend.updates.runtime
 Eclipse-LazyStart: true
 Bundle-ClassPath: .
 Export-Package: org.talend.designer.codegen,
@@ -46,4 +39,3 @@ Bundle-Vendor: .Talend SA.
 Bundle-Activator: org.talend.designer.codegen.CodeGeneratorActivator
 Import-Package: org.apache.commons.lang
 Eclipse-BundleShape: dir
-Automatic-Module-Name: org.talend.designer.codegen

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

@@ -56,9 +56,8 @@
 	String jobClassPackageFolder = codeGenArgument.getCurrentProjectName().toLowerCase() + '/' + jobFolderName;
 
     boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));//log4j enable
-    boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J2_ACTIVATE__"));//log4j2 enable
-    boolean isLog4j1Enabled = !isLog4j2Enabled;//log4j1 enable
-    String MDC_CLASS = "org.slf4j.MDC";
+	boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J2_ACTIVATE__"));//log4j2 enable
+	boolean isLog4j1Enabled = !isLog4j2Enabled;//log4j1 enable
 
     boolean exist_tParallelize = false;
     List<? extends INode> tParallelizeList = process.getNodesOfType("tParallelize");
@@ -87,12 +86,12 @@
         "tIngresConnection",
         "tInterbaseConnection",
         "tJDBCConnection",
-        "JDBCConnection",
         "tMSSqlConnection",
         "tMysqlConnection",
         "tNetezzaConnection",
         "tOracleConnection",
         "tParAccelConnection",
+        "tPostgresPlusConnection",
         "tPostgresqlConnection",
         "tRedshiftConnection",
         "tSQLiteConnection",
@@ -322,11 +321,6 @@
     	globalMap.put(GLOBAL_CONNECTION_POOL_KEY, connectionPool);
     }
     <%}%>
-    
-    private final static java.util.Properties jobInfo = new java.util.Properties();
-    private final static java.util.Map<String,String> mdcInfo = new java.util.HashMap<>();
-    private final static java.util.concurrent.atomic.AtomicLong subJobPidCounter = new java.util.concurrent.atomic.AtomicLong();
-
 
     public static void main(String[] args){
         final <%=className %> <%=className %>Class = new <%=className %>();
@@ -340,42 +334,6 @@
 
         System.exit(exitCode);
     }
-	
-
-	
-	
-	private void getjobInfo() {
-		final String TEMPLATE_PATH = "src/main/templates/jobInfo_template.properties";
-		final String BUILD_PATH = "../jobInfo.properties";
-		final String path = this.getClass().getResource("").getPath();
-		if(path.lastIndexOf("target") > 0) {
-			final java.io.File templateFile = new java.io.File(
-					path.substring(0, path.lastIndexOf("target")).concat(TEMPLATE_PATH));
-			if (templateFile.exists()) {
-				readJobInfo(templateFile);
-				return;
-			}
-		}
-			readJobInfo(new java.io.File(BUILD_PATH));
-	}
-
-    private void readJobInfo(java.io.File jobInfoFile){
-	
-        if(jobInfoFile.exists()) {
-            try (java.io.InputStream is = new java.io.FileInputStream(jobInfoFile)) {
-            	jobInfo.load(is);
-            } catch (IOException e) {
-            	 <%if(isLog4jEnabled){%>
-                log.debug("Read jobInfo.properties file fail: " + e.getMessage());
-                <%}%>
-                
-            }
-        }
-            <%if(isLog4jEnabled){%>
-		log.info(String.format("Project name: %s\tJob name: %s\tGIT Commit ID: %s\tTalend Version: %s",
-				projectName,jobName,jobInfo.getProperty("gitCommitId"), "<%=System.getProperties().getProperty("talend.studio.version")%>"));
-		<%}%>
-    }
 
    <%
     if (isTestContainer) {
@@ -557,34 +515,8 @@
 				org.apache.logging.log4j.core.config.Configurator.setLevel(org.apache.logging.log4j.LogManager.getRootLogger().getName(), log.getLevel());
 				<%}%>
 			}
-
-	        getjobInfo();
 			log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Start.");
 		<%}%>
-
-            <%if(isLog4jEnabled && isLog4j2Enabled) {%>
-                java.util.Set<Object> jobInfoKeys = jobInfo.keySet();
-                for(Object jobInfoKey: jobInfoKeys) {
-                    <%=MDC_CLASS%>.put("_" + jobInfoKey.toString(), jobInfo.get(jobInfoKey).toString());
-                }
-                <%=MDC_CLASS%>.put("_pid", pid);
-                <%=MDC_CLASS%>.put("_rootPid", rootPid);
-                <%=MDC_CLASS%>.put("_fatherPid", fatherPid);
-                <%=MDC_CLASS%>.put("_projectName", projectName);
-                <%=MDC_CLASS%>.put("_startTimestamp",java.time.ZonedDateTime.now(java.time.ZoneOffset.UTC ).format( java.time.format.DateTimeFormatter.ISO_INSTANT ));
-                <%=MDC_CLASS%>.put("_jobRepositoryId","<%=process.getId() %>");
-                <%=MDC_CLASS%>.put("_compiledAtTimestamp","<%=java.time.ZonedDateTime.now(java.time.ZoneOffset.UTC ).format( java.time.format.DateTimeFormatter.ISO_INSTANT )%>");
-
-                java.lang.management.RuntimeMXBean mx = java.lang.management.ManagementFactory.getRuntimeMXBean();
-                String[] mxNameTable = mx.getName().split("@"); //$NON-NLS-1$
-                if (mxNameTable.length == 2) {
-                    <%=MDC_CLASS%>.put("_systemPid", mxNameTable[0]);
-                } else {
-                    <%=MDC_CLASS%>.put("_systemPid", String.valueOf(java.lang.Thread.currentThread().getId()));
-                }
-
-                <%
-            }%>
 		
 		<%
 		INode jobCatcherNode = null;
@@ -710,26 +642,14 @@
             pid = TalendString.getAsciiRandomString(6);
         }
 
-        <%if(isLog4jEnabled && isLog4j2Enabled) {%>
-            <%=MDC_CLASS%>.put("_pid", pid);
-        <%}%>
-
         if (rootPid==null) {
             rootPid = pid;
         }
-
-        <%if(isLog4jEnabled && isLog4j2Enabled) {%>
-            <%=MDC_CLASS%>.put("_rootPid", rootPid);
-        <%}%>
-
         if (fatherPid==null) {
             fatherPid = pid;
         }else{
             isChildJob = true;
         }
-        <%if(isLog4jEnabled && isLog4j2Enabled) {%>
-            <%=MDC_CLASS%>.put("_fatherPid", fatherPid);
-        <%}%>
 
 <%
         if (stats) {
@@ -786,7 +706,7 @@
                 //print info and job continue to run, for case: context_param is not empty.
                 System.err.println("Could not find the context " + contextStr);
             }
-            
+
             if(!context_param.isEmpty()) {
                 context.putAll(context_param);
 				//set types for params from parentJobs
@@ -963,13 +883,7 @@
         }
 %>
         //Resume: jobStart
-        resumeUtil.addLog("JOB_STARTED", "JOB:" + jobName, parent_part_launcher, Thread.currentThread().getId() + "", "","","","",resumeUtil.convertToJsonText(context,ContextProperties.class,parametersToEncrypt));
-
-        <%if(isLog4jEnabled && isLog4j2Enabled) {%>
-            <%=MDC_CLASS%>.put("_context", contextStr);
-            log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Started.");
-            java.util.Optional.ofNullable(<%=MDC_CLASS%>.getCopyOfContextMap()).ifPresent(mdcInfo::putAll);
-        <%}%>
+        resumeUtil.addLog("JOB_STARTED", "JOB:" + jobName, parent_part_launcher, Thread.currentThread().getId() + "", "","","","",resumeUtil.convertToJsonText(context,parametersToEncrypt));
 
 <%
         if (stats) {
@@ -1180,10 +1094,6 @@ this.globalResumeTicket = false;//to run others jobs
         runningThreadCount.add(1);
         new Thread(){
             public void run() {
-                <%if(isLog4jEnabled && isLog4j2Enabled) {%>
-                    mdcInfo.forEach(<%=MDC_CLASS%>::put);
-                <% } %>
-
                 java.util.Map threadRunResultMap = new java.util.HashMap();
                 threadRunResultMap.put("errorCode", null);
                 threadRunResultMap.put("status", "");
@@ -1246,15 +1156,9 @@ this.globalResumeTicket = false;//to run others jobs
             if (!componentName.equals("tJobStructureCatcher") && !componentName.equals("tLogCatcher") && !componentName.equals("tFlowMeterCatcher") && !componentName.equals("tAssertCatcher") && !componentName.equals("tStatCatcher") && !componentName.equals("tAsyncIn")) {
 %>
 <%=createCallProcess(rootNode, className, false) %>
-<%
-                if (process.getNodesOfType("tStatCatcher").size() > 0) {
-%>
-<%=statsErrorHandlingAfterMainCall(rootNode, process.getNodesOfType("tStatCatcher"))%>
-<%
-                }
-            }
-        }
-    }// end if(isRunInMultiThread)
+<%    }
+    }
+}// end if(isRunInMultiThread)
 %>
 
 this.globalResumeTicket = true;//to run tPostJob
@@ -1388,15 +1292,6 @@ if (execStat) {
          returnCode = errorCode.intValue();
     }
     resumeUtil.addLog("JOB_ENDED", "JOB:" + jobName, parent_part_launcher, Thread.currentThread().getId() + "", "","" + returnCode,"","","");
-    resumeUtil.flush();
-
-    <%if(isLog4jEnabled && isLog4j2Enabled) {%>
-
-        <%=MDC_CLASS%>.remove("_subJobName");
-        <%=MDC_CLASS%>.remove("_subJobPid");
-        <%=MDC_CLASS%>.remove("_systemPid");
-        log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Finished - status: " + status + " returnCode: " + returnCode );
-    <%}%>
 
     return returnCode;
 
@@ -1870,31 +1765,6 @@ if (execStat) {
                     context_param.put(keyValue.substring(0, index), keyValue.substring(index + 1) );
                 }
             }
-        } else if (arg.startsWith("--context_file")) {
-        	String keyValue = arg.substring(15);
-        	String filePath = new String(java.util.Base64.getDecoder().decode(keyValue));
-        	java.nio.file.Path contextFile = java.nio.file.Paths.get(filePath);
-            try (java.io.BufferedReader reader = java.nio.file.Files.newBufferedReader(contextFile)) {
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    int index = -1;
-                    if ( (index = line.indexOf('=')) > -1) {
-							if (line.startsWith("--context_param")) {
-								if ("id_Password".equals(context_param.getContextType(line.substring(16, index)))) {
-									context_param.put(line.substring(16, index), routines.system.PasswordEncryptUtil.decryptPassword(
-											line.substring(index + 1)));
-								} else {
-									context_param.put(line.substring(16, index), line.substring(index + 1));
-								}
-							}else {//--context_type
-								context_param.setContextType(line.substring(15, index), line.substring(index + 1));
-							}
-                    }
-                }
-            } catch (java.io.IOException e) {
-            	System.err.println("Could not load the context file: " + filePath);
-                e.printStackTrace();
-            }
         } else if (arg.startsWith("--log4jLevel=")) {
             log4jLevel = arg.substring(13);
 		} else if (arg.startsWith("--audit.enabled") && arg.contains("=")) {//for trunjob call

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

@@ -42,10 +42,10 @@ public class CLASS
       
        //List< ? extends IConnection> onSubJobErrorConns = rootNode.getOutgoingConnections(EConnectionType.ON_SUBJOB_ERROR);
        //if(onSubJobErrorConns!=null){
-       //    for(IConnection conn : onSubJobErrorConns) {
+       //    for(IConnection conn : onSubJobErrorConns) {               
        //        toReturn += createCallProcess(conn.getTarget(),  className, isMultiThread);
        //    }
-       //}
+       //}            
         if(isMultiThread){
             toReturn += "\n}catch (java.lang.Error e_" + rootNode.getUniqueName() + ") {\n";
             toReturn += "globalMap.put(\""+rootNode.getUniqueName()+ "_SUBPROCESS_STATE\", -1);\n";
@@ -55,20 +55,7 @@ public class CLASS
        toReturn += "\n}"; 
        return toReturn;
     }
-
-    public String statsErrorHandlingAfterMainCall(INode rootNode, List<? extends INode> statsNodes) {
-        String catchErrorReturn = "catch (Error error_" + rootNode.getUniqueName() + " ) {\n";
-        catchErrorReturn+="end = System.currentTimeMillis();\n";
-        for (INode statCatcherNode : statsNodes) {
-            catchErrorReturn += statCatcherNode.getUniqueName() + ".addMessage(\"failure\", (end-startTime));\n";
-            catchErrorReturn += "try {\n " + statCatcherNode.getDesignSubjobStartNode().getUniqueName() + "Process(globalMap);\n";
-            catchErrorReturn += "} catch (Exception e_" + statCatcherNode.getUniqueName() + ") {\n";
-            catchErrorReturn += "e_" + statCatcherNode.getUniqueName() + ".printStackTrace();\n}\n";
-        }
-        catchErrorReturn+= "throw error_" + rootNode.getUniqueName() + ";\n}\n";
-        return catchErrorReturn;
-    }
-
+		 
     public String generate(Object argument) {
         return "";
     }

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

@@ -138,7 +138,7 @@
  		                    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().setValidateDefaults(false).parse(sst_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%>.getSchemaValue()));
+ 		                        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

@@ -36,15 +36,6 @@
 	boolean stats = codeGenArgument.isStatistics();
 	boolean trace = codeGenArgument.isTrace();
 	boolean isRunInMultiThread = codeGenArgument.getIsRunInMultiThread();
-	
-	boolean exportTypeSpringBoot = false;
-	if (process instanceof org.talend.core.model.process.IProcess2) {
-            org.talend.core.model.process.IProcess2 p2 = (org.talend.core.model.process.IProcess2) process;
-	    if (p2.getProperty() != null && p2.getProperty().getAdditionalProperties() != null) {
-	        exportTypeSpringBoot = "REST_MS".equals(p2.getProperty().getAdditionalProperties().get(org.talend.core.runtime.process.TalendProcessArgumentConstant.ARG_BUILD_TYPE));
-	    } 
-	}
-
 	List<IContextParameter> params = new ArrayList<IContextParameter>();
 	params=process.getContextManager().getDefaultContext().getContextParameterList();
 	String className = process.getName();
@@ -150,8 +141,7 @@ for (INode node : process.getNodesOfType("tRESTClient")) {
     }
 }
 
-boolean isChildRouteJob = !process.getNodesOfType("tRouteInput").isEmpty();
-boolean talendEsbJobFactory = actAsProvider || isChildRouteJob;
+boolean talendEsbJobFactory = actAsProvider || !process.getNodesOfType("tRouteInput").isEmpty();
 boolean talendEsbJob = talendEsbJobFactory || actAsConsumer || ProcessorUtilities.isEsbJob(process);
 
 boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));//log4j enable
@@ -255,11 +245,6 @@ if(isRunInMultiThread){
 
 	<%//uft-8 is for temp file, for example: tSortRow, tMap. Because they need keep reversibility.%>
 	private final static String utf8Charset = "UTF-8";
-
-<%
-if(!exportTypeSpringBoot || isChildRouteJob){
-%>	
-
 	//contains type for every context property
 	public class PropertiesWithType extends java.util.Properties {
 		private static final long serialVersionUID = 1L;
@@ -280,16 +265,9 @@ if(!exportTypeSpringBoot || isChildRouteJob){
 			return propertyTypes.get(key);
 		}
 	}
-<%
-}
-%>	
+	
 	// create and load default properties
 	private java.util.Properties defaultProps = new java.util.Properties();
-	
-<%
-if(!exportTypeSpringBoot){
-%>	
-
 	// create application properties with default
 	public class ContextProperties extends PropertiesWithType {
 
@@ -355,10 +333,6 @@ public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Ch
 		}
 %>
 	}
-	
-<%
-}
-%>		
 	protected ContextProperties context = new ContextProperties(); // will be instanciated by MS.
 	public ContextProperties getContext() {
 		return this.context;

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

@@ -30,10 +30,6 @@ boolean containsTPartitioner = node.getProcess().getNodesOfType("tPartitioner").
 boolean isRunJob = "tRunJob".equals(node.getComponent().getName());
 IProcess process = node.getProcess();
 
-final boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));
-final boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J2_ACTIVATE__"));//log4j2 enable
-final String MDC_CLASS = "org.slf4j.MDC";
-
 boolean isTestContainer=ProcessUtils.isTestContainer(process);
 String className = process.getName();
 if (isTestContainer) {
@@ -195,11 +191,8 @@ for (IConnection iterateConn : iterateConnSet) { //1
 				}
 
 
-				public void run() {
-					<% if(isLog4jEnabled && isLog4j2Enabled) { %>
-						mdcInfo.forEach(<%=MDC_CLASS%>::put);
-					<% } %>
-
+				public void run() {		
+		
 					java.util.Map threadRunResultMap = new java.util.HashMap();
 					threadRunResultMap.put("errorCode", null);
 					threadRunResultMap.put("status", "");

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

@@ -32,8 +32,6 @@
 	boolean stat = codeGenArgument.isStatistics();
 	boolean containsTPartitioner = subTree.getRootNode().getProcess().getNodesOfType("tPartitioner").size() > 0 ? true : false;
     boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(subTree.getRootNode().getProcess(), "__LOG4J_ACTIVATE__"));
-    boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(subTree.getRootNode().getProcess(), "__LOG4J2_ACTIVATE__"));//log4j2 enable
-    String MDC_CLASS = "org.slf4j.MDC";
 %>
 
 <%
@@ -224,7 +222,7 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 				<% if (column.getOriginalDbColumnName() == null) { %>
 				    return null;
 				<% } else { %>
-					return "<%=TalendTextUtils.escapeJavaText(column.getOriginalDbColumnName())%>";
+					return "<%=TalendTextUtils.escapeJavaText(TalendTextUtils.removeQuotes(column.getOriginalDbColumnName()))%>";
 				<% } %>
 				}
 
@@ -1098,8 +1096,7 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 					<%
 				} else if(javaType.isObjectBased() || typeToGenerate.equals("Geometry") || typeToGenerate.equals("Dynamic")) {
 					%>
-						dos.clearInstanceCache();
-						dos.writeObject(this.<%=column.getLabel() %>);
+       			    	dos.writeObject(this.<%=column.getLabel() %>);
 					<%
 				} else {
 					typeToGenerate =JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);
@@ -1431,8 +1428,7 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 					<%
 				} else if(typeToGenerate.equals("Object") || typeToGenerate.equals("Geometry") || typeToGenerate.equals("BigDecimal") || typeToGenerate.equals("List") || typeToGenerate.equals("Dynamic") || typeToGenerate.equals("Document")) {
 					%>
-						objectOut.clearInstanceCache();
-						objectOut.writeObject(this.<%=column.getLabel() %>);
+       			    	objectOut.writeObject(this.<%=column.getLabel() %>);
 					<%
 				} else {
 					typeToGenerate =JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);
@@ -1597,7 +1593,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 				}
 	}
 %>
-
 <% if (subTree.isMethodSizeNeeded()){ %>
 /**
  * Start of Function: <%=subTree.getName() %>Process.
@@ -1608,12 +1603,6 @@ public void <%=subTree.getName() %>Process(final java.util.Map<String, Object> g
 	globalMap.put("<%=subTree.getName() %>_SUBPROCESS_STATE", 0);
 
  final boolean execStat = this.execStat;
-	<%if(isLog4jEnabled && isLog4j2Enabled) {%>
-		mdcInfo.forEach(<%=MDC_CLASS%>::put);
-		<%=MDC_CLASS%>.put("_subJobName", "<%=subTree.getName() %>");
-		<%=MDC_CLASS%>.put("_subJobPid", "<%=getAsciiRandomString(6)%>_" + subJobPidCounter.getAndIncrement());
-	<%}%>
-
 <%
 	boolean isParallelize = false;
 	for (INode node : subTree.getNodes()) {

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

@@ -93,25 +93,7 @@ public class CLASS
         }
         return toReturn;
     }
-
-    // copy from routine TalendString
-    private static String getAsciiRandomString(int length) {
-        java.security.SecureRandom random = new java.security.SecureRandom();
-        int cnt = 0;
-        StringBuilder builder = new StringBuilder();
-        char ch;
-        int end = 'z' + 1;
-        int start = ' ';
-        while (cnt < length) {
-            ch = (char) (random.nextInt(end - start) + start);
-            if (Character.isLetterOrDigit(ch)) {
-                builder.append(ch);
-                cnt++;
-            }
-        }
-        return builder.toString();
-    }
-
+		 
     public String generate(Object argument) {
         return "";
     }

main/plugins/org.talend.designer.codegen/src/main/java/messages_ja.properties

@@ -15,7 +15,7 @@ JavaRoutineSynchronizer.UnsupportedOperation.Exception1=\u30E1\u30BD\u30C3\u30C9
 JavaRoutineSynchronizer.UnsupportedOperation.Exception2=\u30E1\u30BD\u30C3\u30C9\u304C\u5B9F\u88C5\u3055\u308C\u3066\u3044\u307E\u305B\u3093\\: org.talend.designer.codegen.JavaRoutineSynchronizer line\\:58
 JetSkeletonManager.unableLoad=\u30B9\u30B1\u30EB\u30C8\u30F3\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
 JetSkeletonManager.unableSave=\u30B9\u30B1\u30EB\u30C8\u30F3\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093
-JetSkeletonManager.updateProblem=\u30B9\u30B1\u30EB\u30C8\u30F3\u6C38\u7D9A\u30C7\u30FC\u30BF\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6642\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+JetSkeletonManager.updateProblem=\u30B9\u30B1\u30EB\u30C8\u30F3\u6C38\u7D9A\u30C7\u30FC\u30BF\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6642\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F,
 EmfEmittersPersistence.CodeGen.DataMissing=\u30B3\u30FC\u30C9\u751F\u6210\u306E\u30C7\u30FC\u30BF\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u5B8C\u5168\u306A\u30B3\u30FC\u30C9\u751F\u6210\u3092\u958B\u59CB\u3057\u3066\u3044\u307E\u3059\u3002
 CodeGeneratorEmittersPoolFactory.PersitentData.Error=\u6301\u7D9A\u30C7\u30FC\u30BF\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093:
 CodeGeneratorEmittersPoolFactory.JETEmitters.NoPresent=JETEmitter \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3001\u5168\u4F53\u306E\u518D\u521D\u671F\u5316\u304C\u5FC5\u8981\u3067\u3059\u3002
@@ -36,7 +36,7 @@ CodeGenInit.addMarkers=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306B\u30DE\u3
 CodeGenInit.createProject={0}\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u4F5C\u6210
 CodeGenInit.deleteProject={0}\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u524A\u9664
 CodeGenInit.initTemplate=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u521D\u671F\u5316
-CodeGenInit.removeLink=\u30EA\u30F3\u30AF\u3055\u308C\u305F\u30EA\u30BD\u30FC\u30B9\u3092\u524A\u9664
+CodeGenInit.removeLink=\u30EA\u30F3\u30AF\u3055\u308C\u305F\u30EA\u30BD\u30FC\u30B9\u306E\u524A\u9664
 CodeGenInit.saveWorkspace=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306E\u4FDD\u5B58\u4E2D
 DocumentRootImpl.mixed= (\u4E21\u7528:
 NodesSubTree.enableParallel=__ENABLE_PARALLEL__
@@ -45,7 +45,7 @@ TalendJetEmitter.compileFail= \u30B3\u30F3\u30D1\u30A4\u30EB\u5931\u6557: {0} :
 TalendJetEmitter.exception=\u4F8B\u5916
 JetFilesProviderManager.unableLoad={0}\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
 ComponentsFactory.afterSystemComponent=\u30B7\u30B9\u30C6\u30E0\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u5F8C
-ComponentsFactory.componentNotFound=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30D5\u30A9\u30EB\u30C0\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093:
+ComponentsFactory.componentNotFound=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30D5\u30A9\u30EB\u30C0\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093 \\:
 ComponentsFactory.load.components=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30ED\u30FC\u30C9...
 ComponentsFactory.parentNotRecompiled=\u8B66\u544A: *.inc.javajet\u306E\u89AA\u306F\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 ComponentsFactory.loadComponents.missingFolder=\u30D7\u30E9\u30B0\u30A4\u30F3"{1}"\u306B\u30D5\u30A9\u30EB\u30C0\u30FC"{0}"\u304C\u3042\u308A\u307E\u305B\u3093\u3002
@@ -58,8 +58,8 @@ ComponentsPreferencePage.configuration.LINK_STYLE=\u30C7\u30D5\u30A9\u30EB\u30C8
 ComponentsPreferencePage.rowLimit=\u884C\u6570\u5236\u9650
 ComponentsPreferencePage.WarningMsg=Talend Open Studio\u3092\u518D\u8D77\u52D5\u3057\u3066\u3001\u62E1\u5F35\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 ComponentsPreferencePage.WarningTitle=\u8B66\u544A
-ComponentsPreferencePage.directoryFieldLabel=\u30E6\u30FC\u30B6\u30FC\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30D5\u30A9\u30EB\u30C0:
-ComponentsPreferencePage.notValidDirectory=\u3053\u308C\u3092\u9078\u629E\u3059\u308B\u3068\u30D5\u30A9\u30EB\u30C0\u30FC\u304C\u30CD\u30B9\u30C8\u3055\u308C\u307E\u3059\u3002\u3053\u308C\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093\u3002 \u7D9A\u884C\u3057\u307E\u3059\u304B?
+ComponentsPreferencePage.directoryFieldLabel=\u30E6\u30FC\u30B6\u30FC\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30D5\u30A9\u30EB\u30C0 \\:
+ComponentsPreferencePage.notValidDirectory=\u3053\u308C\u3092\u9078\u629E\u3059\u308B\u3068\u30D5\u30A9\u30EB\u30C0\u30FC\u304C\u30CD\u30B9\u30C8\u3055\u308C\u307E\u3059\u3002\u3053\u308C\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093\u3002 \u7D9A\u884C\u3057\u307E\u3059\u304B?,
 ComponentsPreferencePage.installComponentsFailure=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u306B\u5931\u6557\u3057\u307E\u3057\u305F
 ComponentsProviderManager.unableLoad=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30D7\u30ED\u30D0\u30A4\u30C0\u306E\u30ED\u30FC\u30C9\u304C\u3067\u304D\u307E\u305B\u3093
 ComponenttRunJobPreferencePage.label=tRunJob\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u5F8C\u3001\u5BFE\u5FDC\u30B8\u30E7\u30D6\u3092\u8868\u793A\u3057\u306A\u3044\u3002
@@ -76,7 +76,7 @@ XsdValidationCacheManager.unableLoadxsd=XSD\u30D0\u30EA\u30C7\u30FC\u30B7\u30E7\
 XsdValidationCacheManager.unableSavexsd=XSD\u30D0\u30EA\u30C7\u30FC\u30B7\u30E7\u30F3\u306E\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093
 prefs.configuration.LINK_STYLE.AUTO=\u81EA\u52D5
 prefs.configuration.LINK_STYLE.BEZIER_CURVE=\u66F2\u7DDA
-prefs.configuration.LINK_STYLE.LINE=\u76F4\u7DDA(\u9AD8\u901F)
+prefs.configuration.LINK_STYLE.LINE=\u76F4\u7DDA\uFF08\u9AD8\u901F\uFF09
 FAMILY.AS400=AS400
 FAMILY.Access=\u30A2\u30AF\u30BB\u30B9
 FAMILY.Alfresco=Alfresco
@@ -88,7 +88,7 @@ FAMILY.Connections=\u63A5\u7D9A
 FAMILY.Custom_Code=\u30AB\u30B9\u30BF\u30E0\u30B3\u30FC\u30C9
 FAMILY.DB2=DB2
 FAMILY.DB_Generic=\u6C4E\u7528ODBC
-FAMILY.DB_JDBC=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AFJDBC
+FAMILY.DB_JDBC=\u6C4E\u7528JDBC
 FAMILY.DB_SCD=DB SCD
 FAMILY.Data_Quality=\u30C7\u30FC\u30BF\u30AF\u30AA\u30EA\u30C6\u30A3
 FAMILY.Data_Privacy=\u30C7\u30FC\u30BF\u30D7\u30E9\u30A4\u30D0\u30B7\u30FC
@@ -126,7 +126,7 @@ FAMILY.MySQL=MySQL
 FAMILY.Netezza=Netezza
 FAMILY.OLAP_Cube=OLAP\u30AD\u30E5\u30FC\u30D6
 FAMILY.Oracle=Oracle
-FAMILY.Orchestration=\u30AA\u30FC\u30B1\u30B9\u30C8\u30EC\u30FC\u30B7\u30E7\u30F3\u5316
+FAMILY.Orchestration=\u30D7\u30ED\u30BB\u30B9\u5236\u5FA1
 FAMILY.Output=\u51FA\u529B
 FAMILY.ParAccel=ParAccel
 FAMILY.PostgreSQL=PostgreSQL

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

@@ -599,13 +599,6 @@ public class CodeGenerator implements ICodeGenerator {
 
                 } else {
                     // if (!isIterate) {
-                    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(generateComponentCode(subProcess, node, ECodePart.END, incomingName, typeGen));
                     // }
                     if (node.getComponent() instanceof Component) {
@@ -636,6 +629,12 @@ public class CodeGenerator implements ICodeGenerator {
                         }
                     }
 
+                    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,
@@ -656,14 +655,11 @@ public class CodeGenerator implements ICodeGenerator {
         return codeComponent;
     }
 
-    private static final String TACOKIT_PROCESSOR_CODE_DIR = "tacokit/jet_stub/generic/processor";
-    
     private boolean isTacokitProcessor(final INode node) {
-        final String componentModelClass = node.getComponent().getClass().getName();
-        return ("org.talend.sdk.component.studio.ComponentModel".equals(componentModelClass) || "org.talend.sdk.component.studio.AdditionalJDBCComponentModel".equals(componentModelClass))
-                && (!NodeUtil.getIncomingConnections(node, IConnectionCategory.DATA).isEmpty() || TACOKIT_PROCESSOR_CODE_DIR.equals(node.getComponent().getTemplateFolder()));
+        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/CodeGeneratorService.java

@@ -152,9 +152,7 @@ public class CodeGeneratorService implements ICodeGeneratorService {
         ComponentsFactoryProvider.getInstance().resetCache();
         ILibraryManagerService librairesManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault().getService(
                 ILibraryManagerService.class);
-        //TUP-31721: The generated studio index will include every possible values with TP_ALL license . 
-        //Studio 8 will not re-generate the index after applying patch and installing any component.
-        librairesManagerService.clearCache(false);
+        librairesManagerService.clearCache();
         CorePlugin.getDefault().getLibrariesService().syncLibraries();
         Job job = CodeGeneratorEmittersPoolFactory.initialize();
         // achen modify to record ctrl+shift+f3 is pressed to fix bug 0006107

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/components/model/ComponentsFactory.java

@@ -46,7 +46,6 @@ import org.talend.commons.exception.BusinessException;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.utils.io.FilesUtils;
 import org.talend.core.GlobalServiceRegister;
-import org.talend.core.ILibraryManagerService;
 import org.talend.core.language.LanguageManager;
 import org.talend.core.model.component_cache.ComponentsCache;
 import org.talend.core.model.components.AbstractComponentsProvider;
@@ -59,9 +58,7 @@ import org.talend.core.model.components.IComponentsFactory;
 import org.talend.core.model.components.IComponentsHandler;
 import org.talend.core.model.components.filters.ComponentsFactoryProviderManager;
 import org.talend.core.model.components.filters.IComponentFactoryFilter;
-import org.talend.core.runtime.services.IGenericService;
 import org.talend.core.runtime.util.ComponentsLocationProvider;
-import org.talend.core.service.ITCKUIService;
 import org.talend.core.ui.IJobletProviderService;
 import org.talend.core.ui.ISparkJobletProviderService;
 import org.talend.core.ui.ISparkStreamingJobletProviderService;
@@ -75,7 +72,6 @@ import org.talend.designer.core.model.components.EmfComponent;
 import org.talend.designer.core.model.process.AbstractProcessProvider;
 import org.talend.designer.core.model.process.GenericProcessProvider;
 import org.talend.designer.core.ui.editor.jobletcontainer.JobletUtil;
-import org.talend.designer.core.utils.UnifiedComponentUtil;
 
 /**
  * Component factory that look for each component and load their information. <br/>
@@ -94,8 +90,6 @@ public class ComponentsFactory implements IComponentsFactory {
 
     private static Set<IComponent> customComponentList = new HashSet<>(); // user/exchange/tck components
 
-    private static Map<IComponent, File> customComponentFolderMap = new HashMap<IComponent, File>();
-
     private IProgressMonitor monitor;
 
     private SubMonitor subMonitor;
@@ -138,7 +132,6 @@ public class ComponentsFactory implements IComponentsFactory {
             componentList.clear();
             skeletonList.clear();
             customComponentList.clear();
-            customComponentFolderMap.clear();
 
             boolean needRegenerate = false;
             if (CodeGeneratorActivator.getDefault().getBundle().getBundleContext().getProperty("osgi.dev") != null) {
@@ -176,8 +169,6 @@ public class ComponentsFactory implements IComponentsFactory {
             initComponentNameMap();
 
             isInitializing.set(false);
-            // sync custom component libs after init
-            syncCustomComponentLibs();
             // TimeMeasure.step("initComponents", "createCache");
             log.info(componentList.size() + " components loaded in " + (System.currentTimeMillis() - startTime) + " ms"); //$NON-NLS-1$ //$NON-NLS-2$
 
@@ -234,15 +225,7 @@ public class ComponentsFactory implements IComponentsFactory {
             if (StringUtils.isEmpty(componentName)) {
                 continue;
             }
-            if (IGenericService.getService().isTcompv0(component)
-                    && (UnifiedComponentUtil.isAdditionalJDBCComponent(component.getName())
-                            || component.getName().contains(ITCKUIService.get().getTCKJDBCType().getLabel()))) {
-                continue;
-            }
             String componentNameLowerCase = componentName.toLowerCase();
-            if (componentNameLowerCase.startsWith(ITCKUIService.get().getTCKJDBCType().getLabel().toLowerCase())) {
-                componentNameLowerCase = "t" + componentNameLowerCase;
-            }
             Map<String, Set<IComponent>> map = componentNameMap.get(componentNameLowerCase);
             if (map == null) {
                 map = new HashMap<String, Set<IComponent>>();
@@ -385,7 +368,6 @@ public class ComponentsFactory implements IComponentsFactory {
                     } else {
                         componentList.add(currentComp);
                         customComponentList.add(currentComp);
-                        customComponentFolderMap.put(currentComp, currentFolder);
                     }
                 } catch (MissingMainXMLComponentFileException e) {
                     log.trace(currentFolder.getName() + " is not a " + getCodeLanguageSuffix() + " component", e); //$NON-NLS-1$ //$NON-NLS-2$
@@ -405,23 +387,6 @@ public class ComponentsFactory implements IComponentsFactory {
         }
     }
 
-    private void syncCustomComponentLibs() {
-        try {
-            if (GlobalServiceRegister.getDefault().isServiceRegistered(ILibraryManagerService.class)) {
-                ILibraryManagerService libraryService = GlobalServiceRegister.getDefault()
-                        .getService(ILibraryManagerService.class);
-                if (libraryService != null) {
-                    customComponentFolderMap.forEach((component, componentFolder) -> libraryService
-                            .deployLibsFromCustomComponents(componentFolder, component.getModulesNeeded()));
-                }
-            }
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        } finally {
-            customComponentFolderMap.clear();
-        }
-    }
-
     private void loadComponentsFromFolder(String pathSource, AbstractComponentsProvider provider) {
         // Changed by Marvin Wang on Feb.22 for bug TDI-19166, caz the test ConnectionManagerTest maybe get the null
         // context.

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/components/model/ComponentsProviderManager.java

@@ -14,7 +14,6 @@ package org.talend.designer.codegen.components.model;
 
 import java.util.ArrayList;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
@@ -22,9 +21,6 @@ import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.JavaCore;
-import org.talend.commons.utils.VersionUtils;
-import org.talend.commons.utils.generation.JavaUtils;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.components.AbstractComponentsProvider;
 import org.talend.core.runtime.util.SharedStudioInfoProvider;
@@ -65,26 +61,6 @@ public final class ComponentsProviderManager {
                     String id = configurationElement.getAttribute("id"); //$NON-NLS-1$
                     String folderName = configurationElement.getAttribute("folderName"); //$NON-NLS-1$
                     String contributerName = configurationElement.getContributor().getName();
-                    String javaMajorVersion = configurationElement.getAttribute("javaMajorVersion");
-                    
-                    // if no java version, load them all, otherwise check
-                    if (!StringUtils.isEmpty(javaMajorVersion)) {
-                        if (!StringUtils.equals(JavaCore.VERSION_17, javaMajorVersion)
-                                && !StringUtils.equals(JavaCore.VERSION_1_8, javaMajorVersion)) {
-                            log
-                                    .warn("Invalid java version: " + javaMajorVersion + " was set for component provider, id: "
-                                            + id + ", folderName: " + folderName + ", contributor: " + contributerName);
-                        }
-                        // if provider's java version == project's java version
-                        String projectJavaVersion = JavaUtils.getComplianceLevel();
-                        if (VersionUtils.compareTo(javaMajorVersion, projectJavaVersion) != 0) {
-                            log
-                                    .warn("Java version: " + javaMajorVersion + ", project java version: "
-                                            + projectJavaVersion + ", skip loading component provider, id: " + id
-                                            + ", folderName: " + folderName + ", contributor: " + contributerName);
-                            continue;
-                        }
-                    }
                     IBrandingService brandingService = (IBrandingService) GlobalServiceRegister.getDefault().getService(
                             IBrandingService.class);
                     if (!brandingService.isPoweredOnlyCamel()
@@ -100,7 +76,6 @@ public final class ComponentsProviderManager {
                         componentsProvider.setId(id);
                         componentsProvider.setFolderName(folderName);
                         componentsProvider.setContributer(contributerName);
-                        componentsProvider.setJavaMajorVersion(javaMajorVersion);
                         providers.add(componentsProvider);
                     } catch (CoreException e) {
                         log.error(Messages.getString("ComponentsProviderManager.unableLoad") + id, e); //$NON-NLS-1$

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/components/model/UserComponentsTokenCollector.java

@@ -13,7 +13,6 @@
 package org.talend.designer.codegen.components.model;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.talend.core.model.components.IComponent;
 import org.talend.core.ui.component.ComponentsFactoryProvider;
@@ -46,7 +45,6 @@ public class UserComponentsTokenCollector extends AbstractTokenCollector {
     public JSONObject collect() throws Exception {
         JSONObject object = new JSONObject();
         List<IComponent> customComponents = ComponentsFactoryProvider.getInstance().getCustomComponents();
-        customComponents = filterOutComponents(customComponents);
         JSONArray customComponentsArray = new JSONArray();
         if (customComponents != null) {
             for (int i = 0; i < customComponents.size(); i++) {
@@ -57,9 +55,4 @@ public class UserComponentsTokenCollector extends AbstractTokenCollector {
         return object;
     }
 
-    private List<IComponent> filterOutComponents(List<IComponent> customComponents) {
-        customComponents = customComponents.stream().filter(comp ->!"tTaCoKitGuessSchema".equals(comp.getName())).collect(Collectors.toList());
-        return customComponents;
-    }
-
 }

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/config/EInternalTemplate.java

@@ -55,9 +55,6 @@ public enum EInternalTemplate {
     CAMEL_RUNIF("camel_run_if", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
     CAMEL_SPECIALLINKS("camel_speciallinks", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
     MICROSERVICE_APP("microservice_app", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
-    MICROSERVICE_APP_MS_CONTEXT_PROPERTIES("microservice_app_ms_context_properties","0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
-    MICROSERVICE_APP_CONTEXT_PROPERTIES("microservice_app_context_properties","0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
-    MICROSERVICE_APP_PROPERTIES("microservice_app_properties","0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
 
     HEADER_ADDITIONAL("header_additional", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
 

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/config/TalendJetEmitter.java

@@ -378,7 +378,7 @@ public class TalendJetEmitter extends JETEmitter {
                         // Construct a proper URL for relative lookup.
                         //
                         URL url = new File(project.getLocation() + "/" + "runtime" + "/") //$NON-NLS-1$ //$NON-NLS-2$
-                                .toURI().toURL();
+                                .toURL();
                         URLClassLoader theClassLoader = new URLClassLoader(new URL[] { url }, jetEmitter.classLoader);
                         Class theClass = theClassLoader.loadClass((packageName.length() == 0 ? "" : packageName + ".") //$NON-NLS-1$ //$NON-NLS-2$
                                 + jetCompiler.getSkeleton().getClassName());
@@ -633,7 +633,7 @@ public class TalendJetEmitter extends JETEmitter {
             final IWorkspace workspace = ResourcesPlugin.getWorkspace();
             IProject project = workspace.getRoot().getProject(projectName);
 
-            URL url = new File(project.getLocation() + "/runtime").toURI().toURL(); //$NON-NLS-1$
+            URL url = new File(project.getLocation() + "/runtime").toURL(); //$NON-NLS-1$
             currentClassLoader = jetbean.getClassLoader();
             theClassLoader = new URLClassLoader(new URL[] { url }, jetbean.getClassLoader());
         }

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

@@ -418,13 +418,6 @@ public final class CodeGeneratorEmittersPoolFactory {
             jetBean.setClassLoader(createDelegateClassLoader(jetBean.getClassLoader(), sparkUtilsPluginName,
                     "org.talend.designer.spark.SparkPlugin")); //$NON-NLS-1$
         }
-        String bigdataDIUtilsPluginName = "org.talend.designer.bigdata.di"; //$NON-NLS-1$
-        if (PluginChecker.isPluginLoaded(bigdataDIUtilsPluginName)) {
-            jetBean.addClassPath("BIGDATA_DI_LIBRARIES", bigdataDIUtilsPluginName); //$NON-NLS-1$
-            jetBean.setClassLoader(createDelegateClassLoader(jetBean.getClassLoader(), bigdataDIUtilsPluginName,
-                    "org.talend.designer.bigdata.di.BigdataDiPlugin")); //$NON-NLS-1$
-        }
-
         return jetBean;
     }
 
@@ -480,7 +473,6 @@ public final class CodeGeneratorEmittersPoolFactory {
             // generate the code.
             String sparkUtilsPluginName = "org.talend.designer.spark"; //$NON-NLS-1$
             String bigDataUtilsPluginName = "org.talend.designer.bigdata"; //$NON-NLS-1$
-            String bigdataDIUtilsPluginName = "org.talend.designer.bigdata.di"; //$NON-NLS-1$
             if (PluginChecker.isPluginLoaded(sparkUtilsPluginName) && ("SPARK".equals(component.getPaletteType()) //$NON-NLS-1$
                     || "MR".equals(component.getPaletteType()) || "STORM".equals(component.getPaletteType()) //$NON-NLS-1$ //$NON-NLS-2$
                     || "SPARKSTREAMING".equals(component.getPaletteType()))) { //$NON-NLS-1$
@@ -502,22 +494,6 @@ public final class CodeGeneratorEmittersPoolFactory {
                             jetBean.getClassLoader()));
                 }
 
-            } else if (PluginChecker.isPluginLoaded(bigdataDIUtilsPluginName)) { //$NON-NLS-1$
-                    jetBean.addClassPath("BIGDATA_DI_LIBRARIES", bigdataDIUtilsPluginName); //$NON-NLS-1$
-                    jetBean.setClassLoader(createDelegateClassLoader(new CodeGeneratorEmittersPoolFactory().getClass().getClassLoader(),
-                                    bigdataDIUtilsPluginName, "org.talend.designer.bigdata.di.BigdataDiPlugin")); //$NON-NLS-1$
-
-                    // If Big Data DI AND with an external component, use the external component as the parent classloader and
-                    // Big Data DI as a secondary, delegate classloader.
-                    if (component.getPluginExtension() != null) {
-                        jetBean.addClassPath(
-                                "EXTERNAL_COMPONENT_" + component.getPluginExtension().toUpperCase().replaceAll("\\.", "_"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                                component.getPluginExtension());
-                        jetBean.setClassLoader(new DelegateClassLoader(
-                                ExternalNodesFactory.getInstance(component.getPluginExtension()).getClass().getClassLoader(),
-                                jetBean.getClassLoader()));
-                    }
-
             } else if (component.getPluginExtension() != null) {
 
                 jetBean.addClassPath("EXTERNAL_COMPONENT_" + component.getPluginExtension().toUpperCase().replaceAll("\\.", "_"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -564,7 +540,7 @@ public final class CodeGeneratorEmittersPoolFactory {
             JetBean jetBean = new JetBean(componentsPath, templateURI, "component", component.getVersion(), //$NON-NLS-1$
                     "", codePart.getName());//$NON-NLS-1$
             addCommonLibs(jetBean);
-            jetBean.addClassPath("AVRO", "avro"); //$NON-NLS-1$ //$NON-NLS-2$
+            jetBean.addClassPath("AVRO", "org.apache.servicemix.bundles.avro"); //$NON-NLS-1$ //$NON-NLS-2$
 
             for (String pluginDependency : component.getPluginDependencies()) {
                 jetBean.addClassPath(pluginDependency.toUpperCase().replaceAll("\\.", "_") + "_LIBRARIES", pluginDependency); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

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

@@ -38,7 +38,9 @@ import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
+import org.osgi.framework.Bundle;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.runtime.utils.io.IOUtils;
 import org.talend.core.model.components.ComponentCompilations;
@@ -136,6 +138,9 @@ public final class JetSkeletonManager {
         }
         project.open(new NullProgressMonitor());
         IFile file = project.getFile("SkeletonUpdateCache"); //$NON-NLS-1$
+        if (!file.exists()) {
+            file.create(null, true, new NullProgressMonitor());
+        }
         return file.getLocation().toFile();
     }
 

main/plugins/org.talend.designer.components.exchange/.classpath

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="class"/>
+</classpath>

main/plugins/org.talend.designer.components.exchange/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.designer.components.exchange</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

main/plugins/org.talend.designer.components.exchange/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,3 @@
+#Wed Aug 31 14:34:59 CST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

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

@@ -0,0 +1,41 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Exchange Plug-in
+Bundle-SymbolicName: org.talend.designer.components.exchange;singleton:=true
+Bundle-Version: 8.8.8.qualifier
+Bundle-Activator: org.talend.designer.components.exchange.ExchangePlugin
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.apache.log4j,
+ org.apache.commons.collections,
+ org.apache.commons.discovery,
+ org.apache.commons.logging,
+ org.apache.commons.commons-beanutils,
+ org.apache.commons.io,
+ org.apache.commons.lang,
+ org.apache.commons.httpclient,
+ org.talend.commons.ui,
+ org.talend.core,
+ org.talend.core.ui,
+ org.talend.utils,
+ org.talend.librariesmanager,
+ org.talend.libraries.mozilla;resolution:=optional,
+ org.talend.libraries.uniserv;resolution:=optional,
+ org.talend.designer.core,
+ org.talend.model,
+ org.talend.repository,
+ org.talend.core.repository,
+ org.talend.updates.runtime,
+ org.eclipse.ui.intro,
+ org.eclipse.ui.forms,
+ org.eclipse.jface.text
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: .Talend SA.
+Export-Package: org.talend.designer.components.exchange,
+ org.talend.designer.components.exchange.i18n,
+ org.talend.designer.components.exchange.ui,
+ org.talend.designer.components.exchange.ui.views
+Eclipse-BundleShape: dir
+Import-Package: org.codehaus.jackson,
+ org.codehaus.jackson.map,
+ org.talend.registration.wizards.register

main/plugins/org.talend.designer.components.exchange/build.properties

@@ -0,0 +1,17 @@
+source.. = src/main/java/
+output.. = class/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               icons/,\
+               plugin.properties,\
+               model/,\
+               content/,\
+               plugin_de.properties,\
+               plugin_en.properties,\
+               plugin_fr.properties,\
+               plugin_it.properties,\
+               plugin_ja.properties,\
+               plugin_ru.properties,\
+               plugin_swtbot.properties,\
+               plugin_zh_CN.properties

main/plugins/org.talend.designer.components.exchange/content/css/exchange.css

@@ -0,0 +1,204 @@
+body, td, th {
+	font-size: 12px;
+	color: #404040;
+	line-height: 23px;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	padding: 5px;
+}
+input, textarea {
+	border: 1px solid #9BB9F5;
+}
+body {
+	margin: 0px;
+	height: 100%;
+	background-color: #EBEBDB;
+}
+ul {
+	margin: 0px;
+	padding: 0px;
+	list-style-type: none;
+}
+a:link.xh {
+	color: #000000;
+	text-decoration: none;
+}
+a:hover.xh {
+	text-decoration: none;
+}
+a:visited.xh {
+	text-decoration: none;
+	color: #000000;
+}
+.hover {
+	background: rgb(167,207,223); /* Old browsers */
+	color: white
+}
+.leave {
+	background: none;
+}
+img {
+	border: 0px;
+}
+.style_1 {
+	font-size: 16px;
+}
+.style_2 {
+	color: #000000;
+}
+.style_3 {
+	font-weight: bold;
+}
+
+.style_4{
+	font-size: 16px;
+	font-weight: bold;
+	color: #000000;
+}
+
+div {
+	margin: 0;
+	padding: 0
+}
+#container {
+	position:relative;
+	left: 0;
+	top: 0;	
+	width: 100%;
+	height: 100%;
+}
+#container .menu {
+	position: absolute;
+	left: 0;
+	top: 0;	
+	width: 200px;
+	height: 100%;
+	float: left;
+	border: 1px solid #9BB9F5;
+	border-right: 0px;
+}
+#container .main1 {
+	position: absolute;
+	left: 200;
+	top: 0;	
+	float: left;
+	background: #FFFFFF;
+}
+#menu li {
+	display: block;
+	cursor: pointer;
+	text-align: left;
+	padding: 0px 0px;
+}
+.ulhide {
+	display: none;
+	overflow: auto;
+}
+.ulblock {
+	display: block;
+}
+.left_1 {
+	width: 100px;
+	margin-top: 10px;
+	float: left;
+	padding-left: 0px;
+	vertical-align: top;
+	margin-right: 10px;
+}
+.compDesc {
+	height: 200px;
+	margin-top: 10px;
+	margin-bottom: 30px;
+	padding-left: 20px;
+	overflow: auto;
+	border: 1px solid #9BB9F5;
+}
+.compImg {
+	height: 200px;
+	margin-top: 10px;
+	margin-bottom: 30px;
+	padding-left: 10px;
+	border: 1px solid #9BB9F5;
+}
+.reviews {
+	width: 60%;
+	height: 350px;
+	margin-bottom: 10px;
+	padding-left: 10px;
+	word-break: break-all;
+	WORD-WRAP: break-word;
+}
+.userreview {
+	font-size: 13px;
+	color: #000000;
+	font-weight: bold;
+	padding-left: 10px;
+}
+.left_11 {
+	width: 100px;
+	margin-top: 10px;
+	float: left;
+	padding-left: 0px;
+	vertical-align: top;
+	margin-right: 10px;
+}
+.toolbar {
+	background-color: #EBEBDB;
+	border: 1px solid #9BB9F5;
+	border-bottom: 0px;
+	height: 40px;
+	padding: 5px;
+}
+.icon {
+	-moz-border-radius: 3px;
+	border: 1px solid #EBEBDB;
+	border-radius: 3px;
+	padding: 5px;
+	vertical-align: middle;
+	cursor: pointer;
+}
+a.icon:hover {
+	border: 1px solid #9BB9F5;
+}
+.toolbarButton {
+	-moz-border-radius: 3px;
+	border: 1px solid #EBEBDB;
+	border-radius: 3px;
+	cursor: pointer;
+	padding: 5px;
+	text-align: center;
+	width: 140px;
+}
+a.toolbarButton:hover {
+	border: 1px solid #9BB9F5;
+}
+table.tableStyle {
+	width: 600px;
+}
+.formStyle {
+	position: relative;
+	height: 100%;
+	border: 1px solid #9BB9F5;
+	border-top: 0px;
+}
+
+div.fileinputs {
+	position: relative;
+}
+
+div.fakefile {
+	position: absolute;
+	top: 0px;
+	left: 0px;
+	z-index: 1;
+}
+
+input.file {
+	position: relative;
+	text-align: right;
+	-moz-opacity:0 ;
+	filter:alpha(opacity: 0);
+	opacity: 0;
+	z-index: 2;
+	width: 260px;
+	cursor: pointer;
+}

main/plugins/org.talend.designer.components.exchange/content/exchange_all.html

@@ -0,0 +1,620 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
+		<script type="text/javascript">
+		
+		String.prototype.replaceAll = function(s1, s2) {
+			return this.replace(new RegExp(s1, "gm"), s2);
+		}
+		String.prototype.replaceAll2Excep = function(s1, s2) {
+			var temp = this;
+			while(temp.indexOf(s1) != -1) {
+				temp = temp.replace(s1, s2);
+			}
+			return temp;
+		}
+		
+		function onResizeDocument () {
+			var navName = navigator.appName;
+			var newWidth = null;
+			var tabs;
+			var intWidth = null;
+			var newWidth = null;
+			if(navName == 'Microsoft Internet Explorer'){
+				intWidth = (document.body.clientWidth - 213);
+			}else{
+				intWidth = (document.width - 213);
+			}
+			newWidth = intWidth+"px";
+			tabs = document.getElementsByTagName("table");
+			
+			tabs[0].style.width = newWidth;
+			tabs[1].style.width = newWidth;
+			tabs[2].style.width = (intWidth - 20)+"px";
+			tabs[4].style.width = newWidth;
+			tabs[5].style.width = newWidth;
+			tabs[6].style.width = newWidth;
+			tabs[9].style.width = newWidth;
+			tabs[12].style.width = newWidth;
+		}
+			
+			function onchangeFileUpload(fileId,fakefileId){
+				var v = document.getElementById(fileId).value;
+				document.getElementById(fakefileId).value=v;
+			}
+			
+			function filterReWriteUrl() {
+				var prefix = "http://org.eclipse.ui.intro/runAction?pluginId=org.talend.designer.components.exchange&amp;class=org.talend.designer.components.exchange.ui.actions.FilterExtensionAction&amp;id=org.talend.designer.components.exchange.ui.actions.FilterExtensionAction&amp;text="
+				var jsonObj = document.getElementById("avialable_filter_text").value;
+				var url = prefix + jsonObj;
+				document.getElementById('commit_filter').href = url;
+			}
+			
+			function createNewExtensionWriteUrl() {
+			
+				
+				var prefix = "http://org.eclipse.ui.intro/runAction?pluginId=org.talend.designer.components.exchange&amp;class=org.talend.designer.components.exchange.ui.htmlcontent.MyExtensionAction&amp;id=org.talend.designer.components.exchange.ui.htmlcontent.MyExtensionAction&amp;type=UPLOAD_MY_EXTENSION"
+			
+				var label = "label:" + "'" + document.getElementById("extension_label").value + "'";
+				var lastVersionAvailable = "lastVersionAvailable:" + "'" + document.getElementById("lastVersionAvailable").value + "'";
+				var description = "description:" + "'" + document.getElementById("extension_description").value + "'";
+				description = description.replaceAll2Excep("\r\n", "/n/r");
+			
+				var checkedType = "";
+				var filtervalue = "";
+				var compatibilities = document.getElementsByName("compatibility");
+				if(compatibilities[0].checked == true) {
+					checkedType = "all"
+					filtervalue = null;
+				} else if(compatibilities[1].checked == true) {
+					checkedType = "older"
+					filtervalue = document.getElementById(checkedType).value;
+				} else if(compatibilities[2].checked == true) {
+					checkedType = "newer"
+					filtervalue = document.getElementById(checkedType).value;
+				} else if(compatibilities[3].checked == true) {
+					checkedType = "except"
+					filtervalue = document.getElementById(checkedType).value;
+				} else if(compatibilities[4].checked == true) {
+					checkedType = "only"
+					filtervalue = document.getElementById(checkedType).value;
+				}
+				
+				<!-- validate the createNewExtension text  start-->
+				var labelValidate = document.getElementById("extension_label").value;
+				var lastVersionAvailableValidate = document.getElementById("lastVersionAvailable").value;
+				var filename = document.getElementById("filename").value;
+				var isSkipPage = true;
+				if(labelValidate.replace(/\s/g,"")==""){  
+        			alert("Extension Title is empty"); 
+        			isSkipPage = false; 
+    			}else if(labelValidate!=labelValidate.replace(/(^\s*)|(\s*$)/g,"")){
+        			alert("Extension Title contains incorrect characters!");  
+        			isSkipPage = false; 
+    			}else if(labelValidate=="null"){  
+        			alert("Extension Title can not be null");  
+        			isSkipPage = false; 
+    			}else if(lastVersionAvailableValidate.replace(/\s/g,"")==""){  
+        			alert("Initial Version is empty");  
+        			isSkipPage = false; 
+    			}else if(lastVersionAvailableValidate!=lastVersionAvailableValidate.replace(/[^\w\.\/]/ig,'')){  
+        			alert("Initial Version contains incorrect characters!");  
+        			isSkipPage = false; 
+    			}else if(lastVersionAvailableValidate=="null"){  
+        			alert("Initial Version can not be null");  
+        			isSkipPage = false; 
+    			}else if(filename.replace(/\s/g,"")==""){
+    				alert("Please input a vaild File path");  
+    				isSkipPage = false; 
+    			}
+    			
+    			<!-- validate the createNewExtension text  end-->
+				if (isSkipPage == true) {
+					var listVersionCompatibles = "listVersionCompatibles:" + "'" + checkedType + "'";
+					var filter = "filter:" + "'" + filtervalue + "'";
+					var filename = "filename:" + "'" + document.getElementById("filename").value + "'";
+					filename = filename.replaceAll2Excep("\\", "/");
+					var jsonObj = "{" + label + "," + lastVersionAvailable + "," + description + "," + listVersionCompatibles + "," + filter + "," + filename + "}"
+				
+					var url = prefix + "&amp;extensionValues=" + jsonObj;
+					document.getElementById('commit').href = url;
+					window.location.href = document.getElementById('commit').href;
+				}
+				
+			}
+			
+			function updateReWriteUrl() {
+				
+				var prefix = "http://org.eclipse.ui.intro/runAction?pluginId=org.talend.designer.components.exchange&amp;class=org.talend.designer.components.exchange.ui.htmlcontent.MyExtensionAction&amp;id=org.talend.designer.components.exchange.ui.htmlcontent.MyExtensionAction&amp;type=UPDATE_MY_EXTENSION"
+			
+				var lastVersionAvailable = "lastVersionAvailable:" + "'" + document.getElementById("lastVersionAvailable_update").value + "'";
+			
+				var checkedType = "";
+				var filtervalue = "";
+				var compatibilities = document.getElementsByName("compatibility_update");
+				if(compatibilities[0].checked == true) {
+					checkedType = "all"
+					filtervalue = null;
+				} else if(compatibilities[1].checked == true) {
+					checkedType = "older"
+					filtervalue = document.getElementById(checkedType + "_update").value;
+				} else if(compatibilities[2].checked == true) {
+					checkedType = "newer"
+					filtervalue = document.getElementById(checkedType + "_update").value;
+				} else if(compatibilities[3].checked == true) {
+					checkedType = "except"
+					filtervalue = document.getElementById(checkedType + "_update").value;
+				} else if(compatibilities[4].checked == true) {
+					checkedType = "only"
+					filtervalue = document.getElementById(checkedType + "_update").value;
+				}
+				
+				<!-- validate the updateExtension text  start-->
+				var lastVersionAvailable_updateValidate = document.getElementById("lastVersionAvailable_update").value;
+				var filename_update = document.getElementById("filename_update").value;
+				var isSkipPage = true;
+				if(lastVersionAvailable_updateValidate.replace(/\s/g,"")==""){  
+        			alert("New Version is empty");  
+        			isSkipPage = false;
+    			}else if(lastVersionAvailable_updateValidate!=lastVersionAvailable_updateValidate.replace(/[^\w\.\/]/ig,'')){  
+        			alert("New Version contains incorrect characters!");  
+        			isSkipPage = false; 
+    			}else if(lastVersionAvailable_updateValidate=="null"){  
+        			alert("New Version can not be null");  
+        			isSkipPage = false;
+    			}else if(filename_update.replace(/\s/g,"")==""){
+    				alert("Please input a vaild File path");  
+    				isSkipPage = false; 
+    			}
+    			<!-- validate the updateExtension text  end-->
+			
+				if (isSkipPage == true) {
+					var listVersionCompatibles = "listVersionCompatibles:" + "'" + checkedType + "'";
+					var filter = "filter:" + "'" + filtervalue + "'";
+					var filename = "filename:" + "'" + document.getElementById("filename_update").value + "'";
+					filename = filename.replaceAll2Excep("\\", "/");
+					var jsonObj = "{" + lastVersionAvailable + "," + listVersionCompatibles + "," + filter + "," + filename + "}"
+				
+					var url = prefix + "&amp;extensionValues=" + jsonObj;
+					document.getElementById('commit_update').href = url;
+					window.location.href = document.getElementById('commit_update').href;
+				}
+			
+			}
+			
+			function modifyReWriteUrl() {
+				var prefix = "http://org.eclipse.ui.intro/runAction?pluginId=org.talend.designer.components.exchange&amp;class=org.talend.designer.components.exchange.ui.htmlcontent.MyExtensionAction&amp;id=org.talend.designer.components.exchange.ui.htmlcontent.MyExtensionAction&amp;type=MODIFY_MY_EXTENSION"
+				var leabel = "label:" + "'" + document.getElementById("extension_label_modify").value + "'"
+				var description = "description:" + "'" + document.getElementById("extension_description_modify").value + "'"
+				
+				
+				description = description.replaceAll2Excep("\r\n", "/n/r");
+				var checkedType = "";
+				var filtervalue = "";
+				var compatibilities = document.getElementsByName("compatibility_modify");
+				
+				
+				if(compatibilities[0].checked == true) {
+					checkedType = "all"
+					filtervalue = null;
+				} else if(compatibilities[1].checked == true) {
+					checkedType = "older"
+					filtervalue = document.getElementById(checkedType + "_modify").value;
+				} else if(compatibilities[2].checked == true) {
+					checkedType = "newer"
+					filtervalue = document.getElementById(checkedType + "_modify").value;
+				} else if(compatibilities[3].checked == true) {
+					checkedType = "except"
+					filtervalue = document.getElementById(checkedType + "_modify").value;
+				} else if(compatibilities[4].checked == true) {
+					checkedType = "only"
+					filtervalue = document.getElementById(checkedType + "_modify").value;
+				}
+				
+				var listVersionCompatibles = "listVersionCompatibles:" + "'" + checkedType + "'";
+				var filter = "filter:" + "'" + filtervalue + "'";
+				var jsonObj = "{" + leabel + "," + description + "," + listVersionCompatibles + "," + filter + "}"
+			
+				var url = prefix + "&amp;extensionValues=" + jsonObj;
+				
+				
+				document.getElementById('commit_modify').href = url;
+			}
+			
+			//can't use for cycle in the javascript,each time call the length fuction ,get error in document parser
+			function setTab(tabIndex, pageId) {
+				var tli = document.getElementById("menu").getElementsByTagName("li");
+				var mli = document.getElementById("main1").getElementsByTagName("ul");
+				if(tabIndex == 0) {
+					tli[0].className = "hover"
+					tli[1].className = "leave"
+					tli[2].className = "leave"
+				} else if(tabIndex == 1) {
+					tli[0].className = "leave"
+					tli[1].className = "hover"
+					tli[2].className = "leave"
+				} else if(tabIndex == 2) {
+					tli[0].className = "leave"
+					tli[1].className = "leave"
+					tli[2].className = "hover"
+				}
+				if(pageId == mli[0].id) {
+					mli[0].className = "ulblock"
+					mli[1].className = "ulhide"
+					mli[2].className = "ulhide"
+					mli[3].className = "ulhide"
+					mli[4].className = "ulhide"
+					mli[5].className = "ulhide"
+					mli[6].className = "ulhide"
+				} else if(pageId == mli[1].id) {
+					mli[0].className = "ulhide"
+					mli[1].className = "ulblock"
+					mli[2].className = "ulhide"
+					mli[3].className = "ulhide"
+					mli[4].className = "ulhide"
+					mli[5].className = "ulhide"
+					mli[6].className = "ulhide"
+				} else if(pageId == mli[2].id) {
+					mli[0].className = "ulhide"
+					mli[1].className = "ulhide"
+					mli[2].className = "ulblock"
+					mli[3].className = "ulhide"
+					mli[4].className = "ulhide"
+					mli[5].className = "ulhide"
+					mli[6].className = "ulhide"
+				} else if(pageId == mli[3].id) {
+					mli[0].className = "ulhide"
+					mli[1].className = "ulhide"
+					mli[2].className = "ulhide"
+					mli[3].className = "ulblock"
+					mli[4].className = "ulhide"
+					mli[5].className = "ulhide"
+					mli[6].className = "ulhide"
+				} else if(pageId == mli[4].id) {
+					mli[0].className = "ulhide"
+					mli[1].className = "ulhide"
+					mli[2].className = "ulhide"
+					mli[3].className = "ulhide"
+					mli[4].className = "ulblock"
+					mli[5].className = "ulhide"
+					mli[6].className = "ulhide"
+				} else if(pageId == mli[5].id) {
+					mli[0].className = "ulhide"
+					mli[1].className = "ulhide"
+					mli[2].className = "ulhide"
+					mli[3].className = "ulhide"
+					mli[4].className = "ulhide"
+					mli[5].className = "ulblock"
+					mli[6].className = "ulhide"
+				} else if(pageId == mli[6].id) {
+					mli[0].className = "ulhide"
+					mli[1].className = "ulhide"
+					mli[2].className = "ulhide"
+					mli[3].className = "ulhide"
+					mli[4].className = "ulhide"
+					mli[5].className = "ulhide"
+					mli[6].className = "ulblock"
+				}
+			
+			}
+		</script>
+		<link rel="stylesheet" href="css/exchange.css" type="text/css" media="screen" title="no title" charset="utf-8"/>
+	</head>
+	<body onresize="onResizeDocument()" onload="onResizeDocument()" >
+		<div id="container">
+			<div class="menu" id="menu">
+				<ul id="ul_menu">
+					<li class="hover" id="tab1" onclick="setTab(0,'list_available_extensions')">
+						Available Extensions
+					</li>
+					<li id="tab2" onclick="setTab(1,'downloaded_extensions')">
+						Downloaded Extensions
+					</li>
+					<li id="tab3" onclick="setTab(2,'list_my_extensions')">
+						My Extensions
+					</li>
+				</ul>
+			</div>
+			<div class="main1" id="main1">
+				<!-- available extension list  -->
+				<ul class="ulhide" id="list_available_extensions">
+					<li>
+						<table align="center" cellpadding="0" cellspacing="0" class="tableStyle">
+							<tr align="right">
+								<td colspan="5" class="toolbar">
+								<input id="avialable_filter_text" name="avialable_filter_text" type="text" />
+								<a class="icon" href="http://org.eclipse.ui.intro/runAction?pluginId=org.talend.designer.components.exchange&amp;class=org.talend.designer.components.exchange.ui.actions.FilterExtensionAction&amp;id=org.talend.designer.components.exchange.ui.actions.FilterExtensionAction&amp;text=" id="commit_filter"><img onmouseover="filterReWriteUrl()" src="imgs/refresh.gif"/> </a></td>
+							</tr>
+							<div id="INSERT_EXTENSION_DATA" xmlns="">
+								<contentProvider id="INSERT_EXTENSION_DATA" class="org.talend.designer.components.exchange.ui.htmlcontent.AvailableCompositeProvider" pluginId="org.talend.designer.components.exchange">			</contentProvider>
+							</div>
+						</table>
+					</li>
+				</ul>
+				<!-- extension details  -->
+				<ul class="ulblock" id="extension_details">
+					<li>
+						<table align="center" cellpadding="0" cellspacing="0" class="tableStyle" style="border: 1px solid #9BB9F5;" >
+							<tr align="left">
+								<td class="toolbar" colspan="5" style="border:0px;border-bottom:1px solid #9BB9F5;"><a class="icon"><img onclick="setTab(0,'list_available_extensions')" src="imgs/backward_nav.gif"/></a></td>
+							</tr>
+							<tr align="center">
+								<td>
+								<div id="div_name_part">
+									<div id="LEFT_NAME_PART" xmlns="">
+				            			<contentProvider id="LEFT_NAME_PART" class="org.talend.designer.components.exchange.ui.htmlcontent.ExchangeContentProvider" pluginId="org.talend.designer.components.exchange">			</contentProvider>
+									</div>
+								</div></td>
+							</tr>
+							<tr align="left" valign="top">
+								<td valign="top">
+									<table cellpadding="0" cellspacing="0">
+										<tr>
+											<td width="75%">
+												<div class="compDesc" id="component_description_part">
+													<div id="COMPONENT_DESCRIPTION" xmlns="">
+					                  					<contentProvider id="COMPONENT_DESCRIPTION" class="org.talend.designer.components.exchange.ui.htmlcontent.ExchangeContentProvider" pluginId="org.talend.designer.components.exchange">						</contentProvider>
+													</div>
+												</div>
+											</td>
+											<td width="25%">
+												<div class="compImg" id="component_Image_part">
+													<table align="center" border="0">
+														<tr>
+															<td>
+																<div id="GET_EXTENSION_IMAGE" xmlns="">
+																	<contentProvider id="GET_EXTENSION_IMAGE" class="org.talend.designer.components.exchange.ui.htmlcontent.ExchangeContentProvider" pluginId="org.talend.designer.components.exchange">										</contentProvider>
+								            		    		</div>
+								            		    	</td>
+														</tr>
+														<tr>
+															<td>
+																<div id="RATE_IMANGE" xmlns="">
+																	<contentProvider id="RATE_IMANGE" class="org.talend.designer.components.exchange.ui.htmlcontent.ExchangeContentProvider" pluginId="org.talend.designer.components.exchange">										</contentProvider>
+								                				</div>
+								                			</td>
+														</tr>
+														<tr>
+															<td>
+																<div id="INSTALL_COMPONENT" xmlns="">
+																	<contentProvider id="INSTALL_COMPONENT" class="org.talend.designer.components.exchange.ui.htmlcontent.ExchangeContentProvider" pluginId="org.talend.designer.components.exchange">										</contentProvider>
+								                				</div>
+								                			</td>
+														</tr>
+													</table>
+												</div>
+											</td>
+										</tr>
+										<tr>
+											<td class="userreview">User Reviews </td>
+											<td>
+												<div id="WRITE_REVIEWS" xmlns="">
+										        	<contentProvider id="WRITE_REVIEWS" class="org.talend.designer.components.exchange.ui.htmlcontent.ExchangeContentProvider" pluginId="org.talend.designer.components.exchange">							</contentProvider>
+									        	</div>
+									        </td>
+										</tr>
+										<tr>
+											<td colspan="2">
+												<div class="reviews" id="component_reviews_part">
+													<div id="EXTENSION_REVIEWS" xmlns=""/>
+					                  				<contentProvider id="EXTENSION_REVIEWS" class="org.talend.designer.components.exchange.ui.htmlcontent.ExchangeContentProvider" pluginId="org.talend.designer.components.exchange">					</contentProvider>
+												</div>
+											</td>
+										</tr>
+									</table>
+								</td>
+							</tr>
+						</table>
+					</li>
+				</ul>
+				<!--downloaded extensions page  -->
+				<ul class="ulhide" id="downloaded_extensions">
+					<li>
+						<table align="center" cellpadding="0" cellspacing="0" class="tableStyle">
+							<tr align="left">
+								<td class="toolbar" colspan="5" style="border-bottom:0px solid #9BB9F5;"><a class="icon"><img onclick="setTab(2,'list_my_extensions')" src="imgs/backward_nav.gif"/></a></td>
+							</tr>
+						<div id="DOWNLOADEXTENSION_DATA" xmlns="">
+							<contentProvider id="DOWNLOADEXTENSION_DATA" class="org.talend.designer.components.exchange.ui.htmlcontent.DownloadExtensionProvider" pluginId="org.talend.designer.components.exchange">			</contentProvider>
+							</div>
+						</table>
+					</li>
+				</ul>
+				<!-- my extension list -->
+				<ul class="ulhide" id="list_my_extensions">
+					<li>
+						<table align="center" cellpadding="0" cellspacing="0" id="table" class="tableStyle">
+							<tr align="right">
+								<td class="toolbar" colspan="5">
+								<a onclick="setTab(2,'creat_new_extension')" class="toolbarButton">
+									Add New Extension
+								</a></td>
+							</tr>
+							<div id="LIST_MY_EXTENSION" xmlns="">
+								<contentProvider id="LIST_MY_EXTENSION" class="org.talend.designer.components.exchange.ui.htmlcontent.MyExchangeContentProvider" pluginId="org.talend.designer.components.exchange"/>
+							</div>
+						</table>
+					</li>
+				</ul>
+				<!-- create new extension 	-->
+				<ul class="ulhide" id="creat_new_extension">
+					<li>
+						<table align="center" cellpadding="0" cellspacing="0" id="tab_creat_new_extension" class="tableStyle">
+							<tr align="left">
+								<td class="toolbar" colspan="5" style="border-bottom:1px solid #9BB9F5;"><a class="icon"><img onclick="setTab(2,'list_my_extensions')" src="imgs/backward_nav.gif"/></a></td>
+							</tr>
+							<tr>
+								<td style="padding: 0px">
+								<div class="formStyle">
+									<table>
+										<tr>
+											<td nowrap="nowrap"><span style="margin-left:10px;font-weight:bold;"> Add New Extension </span></td>
+											<td width="100%"></td>
+										</tr>
+										<tr>
+											<td nowrap="nowrap"><span style="margin-left:10px;"> Extension Title: </span></td>
+											<td width="100%"><input id="extension_label" name="extension_label" style="width:230px;margin-left:5px" type="text"/></td>
+										</tr>
+										<tr>
+											<td nowrap="nowrap"><span style="margin-left:10px"> Initial Version: </span></td>
+											<td><input id="lastVersionAvailable" name="lastVersionAvailable" style="width:100px;margin-left:5px" type="text"/></td>
+										</tr>
+										<tr>
+											<td nowrap="nowrap" valign="top"><span style="margin-left:10px;"> Compatibility: </span></td>
+											<td>
+												<table cellpadding="0" cellspacing="0">
+													<tr ><td><input checked="checked" name="compatibility" type="radio"/></td><td>All versions</td><td></td></tr>
+													<tr><td><input name="compatibility" type="radio"/></td><td nowrap="nowrap">Version and older:</td><td width="100%"><input id="older" style="width:100%;" type="text"/></td></tr>
+													<tr><td><input name="compatibility" type="radio"/></td><td nowrap="nowrap">Versions and newer:</td><td><input id="newer" style="width:100%;" type="text"/></td></tr>
+													<tr><td><input name="compatibility" type="radio"/></td><td nowrap="nowrap">All versions except:</td><td><input id="except" style="width:100%;" type="text"/></td></tr>
+													<tr><td><input name="compatibility" type="radio"/></td><td nowrap="nowrap">Only these versions:</td><td><input id="only" style="width:100%;" type="text"/></td></tr>
+												</table>
+											</td>
+										</tr>
+										<tr>
+											<td nowrap="nowrap" valign="top"><span style="margin-left:10px;"> Description: </span></td>
+											<td><textarea id="extension_description" name="extension_description" style="width:100%;height:100px;margin-left:5px" type="text"> </textarea></td>
+										</tr>
+										<tr>
+											<td nowrap="nowrap"><span style="margin-left:10px;"> File: </span></td>
+											<td>
+												<div class="fileinputs" style="margin-left:3px;">
+													<input id="filename" name="filename" type="file" class="file myFileUpload"  onchange="onchangeFileUpload('filename','fake_filename')"  style="cursor: pointer" />
+													<div class="fakefile" style="cursor: pointer; width: 260px">
+														<input id="fake_filename" style="cursor: pointer; width: 230px" class="myFileUpload"/>
+														<img src="imgs/upload.png" style="cursor: pointer"/>
+													</div>
+												</div>
+											</td>
+										</tr>
+										<tr>
+											<td ></td>
+											<td>
+												<a class="xh" href="" id="commit" style="margin-left:5px;">
+													<button onclick="createNewExtensionWriteUrl()" style="width: 176px">
+														Add Extension
+													</button>
+												</a>
+											</td>
+										</tr>
+									</table>
+								</div>
+								</td>
+							</tr>
+						</table>
+					</li>
+				</ul>
+				<!-- update extension -->
+				<ul class="ulblock" id="upload_extension_version">
+					<li>
+						<table align="center" cellpadding="0" cellspacing="0" class="tableStyle" id="tab_upload_extension_version">
+							<tr align="left">
+								<td class="toolbar" colspan="5" style="border-bottom:1px solid #9BB9F5;"><a class="icon"><img onclick="setTab(2,'list_my_extensions')" src="imgs/backward_nav.gif"/></a></td>
+							</tr>
+							<tr>
+								<td style="padding: 0px">
+								<div class="formStyle">
+									<table>
+										<tr>
+											<td nowrap="nowrap"><span style="margin-left:10px;font-weight:bold;"> Upload New Version </span></td>
+											<td width="100%"></td>
+										</tr>
+										<tr>
+											<td nowrap="nowrap"><span style="margin-left:10px"> New Version: </span></td>
+											<td><contentProvider id="LAST_AVAILABLE_VERSION" class="org.talend.designer.components.exchange.ui.htmlcontent.MyExchangeContentProvider" pluginId="org.talend.designer.components.exchange"/></td>
+										</tr>
+										<tr>
+											<td nowrap="nowrap" valign="top"><span style="margin-left:10px;"> Compatibility: </span></td>
+											<td>
+												<table cellpadding="0" cellspacing="0">
+													<tr ><td><input checked="checked" name="compatibility_update" type="radio"/></td><td>All versions</td><td></td></tr>
+													<tr><td><input name="compatibility_update" type="radio"/></td><td nowrap="nowrap">Version and older:</td><td width="100%"><input id="older_update" style="width:100%;" type="text"/></td></tr>
+													<tr><td><input name="compatibility_update" type="radio"/></td><td nowrap="nowrap">Versions and newer:</td><td><input id="newer_update" style="width:100%;" type="text"/></td></tr>
+													<tr><td><input name="compatibility_update" type="radio"/></td><td nowrap="nowrap">All versions except:</td><td><input id="except_update" style="width:100%;" type="text"/></td></tr>
+													<tr><td><input name="compatibility_update" type="radio"/></td><td nowrap="nowrap">Only these versions:</td><td><input id="only_update" style="width:100%;" type="text"/></td></tr>
+												</table>
+											</td>
+										</tr>
+										<tr>
+											<td nowrap="nowrap"><span style="margin-left:10px;"> File: </span></td>
+											<td>
+												<div class="fileinputs" style="margin-left:3px;">
+													<input id="filename_update" name="filename" type="file" class="file myFileUpload"  onchange="onchangeFileUpload('filename_update','fake_filename_update')"  style="cursor: pointer" />													<div class="fakefile" style="cursor: pointer; width: 260px">
+														<input id="fake_filename_update" style="cursor: pointer; width: 230px" class="myFileUpload"/>
+														<img src="imgs/upload.png" style="cursor: pointer"/>
+													</div>
+												</div>
+											</td>
+										</tr>
+										<tr>
+											<td ></td>
+											<td>
+												<a class="xh" href="" id="commit_update" style="margin-left:5px;">
+													<button onclick="updateReWriteUrl()" style="width: 176px">
+														Upload Extension
+													</button>
+												</a>
+											</td>
+										</tr>
+									</table>
+								</div></td>
+							</tr>
+						</table>
+					</li>
+				</ul>
+				<!-- modify myextension -->
+				<ul class="ulblock" id="modify_my_extension_page">
+					<li>
+						<table align="center" border="0" cellpadding="0" cellspacing="0" id="tab_modify_my_extension_page"  class="tableStyle">
+							<tr align="left">
+								<td class="toolbar" colspan="5" style="border-bottom:1px solid #9BB9F5;"><a class="icon"><img onclick="setTab(2,'list_my_extensions')" src="imgs/backward_nav.gif" /></a></td>
+							</tr>
+							<tr>
+								<td style="padding: 0px">
+								
+								<table style="border: 1px solid #9BB9F5; border-top: 0px">
+										<tr>
+											<td nowrap="nowrap"><span style="margin-left:10px;font-weight:bold;"> Modify Last Revision </span></td>
+											<td width="100%"></td>
+										</tr>
+										<tr>
+											<td nowrap="nowrap"><span style="margin-left:10px;"> Extension Title: </span></td>
+											<td width="100%"><contentProvider id="EXTENSION_LABEL" class="org.talend.designer.components.exchange.ui.htmlcontent.MyExchangeContentProvider" pluginId="org.talend.designer.components.exchange"/></td>
+										</tr>
+										<tr>
+											<td nowrap="nowrap" valign="top"><span style="margin-left:10px;"> Compatibility: </span></td>
+											<td>
+												<table cellpadding="0" cellspacing="0">
+													<tr ><td><input checked="checked" name="compatibility_modify" type="radio"/></td><td>All versions</td><td></td></tr>
+													<tr><td><input name="compatibility_modify" type="radio"/></td><td nowrap="nowrap">Version and older:</td><td width="100%"><input id="older_modify" style="width:100%;" type="text"/></td></tr>
+													<tr><td><input name="compatibility_modify" type="radio"/></td><td nowrap="nowrap">Versions and newer:</td><td><input id="newer_modify" style="width:100%;" type="text"/></td></tr>
+													<tr><td><input name="compatibility_modify" type="radio"/></td><td nowrap="nowrap">All versions except:</td><td><input id="except_modify" style="width:100%;" type="text"/></td></tr>
+													<tr><td><input name="compatibility_modify" type="radio"/></td><td nowrap="nowrap">Only these versions:</td><td><input id="only_modify" style="width:100%;" type="text"/></td></tr>
+												</table>
+											</td>
+										</tr>
+										<tr>
+											<td nowrap="nowrap" valign="top"><span style="margin-left:10px;"> Description: </span></td>
+											<td><textarea id="extension_description_modify" name="extension_description" style="width:100%;height:100px;margin-left:5px" type="text"> </textarea></td>
+										</tr>
+										<tr>
+											<td></td>
+											<td>
+												<a class="xh" href="" id="commit_modify" style="margin-left:5px;">
+													<button onclick="window.location.href=document.getElementById('commit_modify').href" onmouseover="modifyReWriteUrl()" style="width: 176px">
+														Modify Last Revision
+													</button>
+												</a>
+											</td>
+										</tr>
+									</table>
+								</td>
+							</tr>
+						</table>
+					</li>
+				</ul>
+			</div>
+		</div>
+	</body>
+</html>