fix(TPS-3290): [7.2.1] SSO enabled Redshift connectivity with Talend 7.2.1 Big Data Platform (Standard Job) (TDI-42674)

2019-08-05 15:20:19 +08:00
9 changed files with 72 additions and 78 deletions
--- a/PATCH_RELEASE_NOTE.md
+++ b/PATCH_RELEASE_NOTE.md
@@ -1,66 +1,57 @@
---
-version: 7.2.1
-module: https://talend.poolparty.biz/coretaxonomy/42
-product:
- https://talend.poolparty.biz/coretaxonomy/23
---
-
-# TPS-4124
-
-| Info             | Value |
-| ---------------- | ---------------- |
-| Patch Name       | Patch\_20200615\_TPS-4124\_v1-7.2.1 |
-| Release Date     | 2020-06-15 |
-| Target Version   | 20190620\_1446-V7.2.1 |
-| Product affected | Talend Studio |
-
-## Introduction
-
-This is a self-contained patch.
-
-**NOTE**: For information on how to obtain this patch, reach out to your Support contact at Talend.
-
-## Fixed issues
-
-This patch contains the following fixes:
-
- TPS-4124 [7.2.1] ClassCastException with tLibraryLoad's Dynamics Libs in Java 11 (TDI-44305)
-
-## Prerequisites
-
-Consider the following requirements for your system:
-
- Talend Studio 7.2.1 must be installed.
-
-## Installation
-
-### Installing the patch using Software update
-
-1) Logon TAC and switch to Configuration->Software Update, then enter the correct values and save referring to the documentation: https://help.talend.com/reader/f7Em9WV_cPm2RRywucSN0Q/j9x5iXV~vyxMlUafnDejaQ
-
-2) Switch to Software update page, where the new patch will be listed. The patch can be downloaded from here into the nexus repository.
-
-3) On Studio Side: Logon Studio with remote mode, on the logon page the Update button is displayed: click this button to install the patch.
-
-### Installing the patch using Talend Studio
-
-1) Create a folder named "patches" under your studio installer directory and copy the patch .zip file to this folder.
-
-2) Restart your studio: a window pops up, then click OK to install the patch, or restart the commandline and the patch will be installed automatically.
-
-### Installing the patch using Commandline
-
-Execute the following commands:
-
-1. Talend-Studio-win-x86_64.exe -nosplash -application org.talend.commandline.CommandLine -consoleLog -data commandline-workspace startServer -p 8002 --talendDebug
-2. initRemote {tac_url} -ul {TAC login username} -up {TAC login password}
-3. checkAndUpdate -tu {TAC login username} -tup {TAC login password}
-
-## Uninstallation
-Backup the Affected files list below. Uninstall the patch by restore the backup files.
-
-## Affected files for this patch
-
-The following files are installed by this patch:
-
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_7.2.1.20190614\_0309/components/tLibraryLoad/tLibraryLoad\_begin.javajet
+---
+version: 7.2.1
+module: https://talend.poolparty.biz/coretaxonomy/42
+product:
+- https://talend.poolparty.biz/coretaxonomy/23
+---
+
+# TPS-3290
+
+| Info             | Value |
+| ---------------- | ---------------- |
+| Patch Name       | Patch\_20190805\_TPS-3290\_v1-7.2.1 |
+| Release Date     | 2019-08-05 |
+| Target Version   | 20190620_1446-V7.2.1 |
+| Product affected | Talend Studio |
+
+## Introduction
+
+This is a self-contained patch.
+
+**NOTE**: For information on how to obtain this patch, reach out to your Support contact at Talend.
+
+## Fixed issues
+
+This patch contains the following fixes:
+
+- TPS-3290 [7.2.1] SSO enabled Redshift connectivity with Talend 7.2.1 Big Data Platform (Standard Job) (TDI-42674)
+
+## Prerequisites
+
+Consider the following requirements for your system:
+
+- Talend Studio 7.2.1 must be installed.
+
+## Installation
+
+### Installing the patch using Software update
+
+1) Logon TAC and switch to Configuration->Software Update, then enter the correct values and save referring to the documentation: https://help.talend.com/reader/f7Em9WV_cPm2RRywucSN0Q/j9x5iXV~vyxMlUafnDejaQ
+
+2) Switch to Software update page, where the new patch will be listed. The patch can be downloaded from here into the nexus repository.
+
+3) On Studio Side: Logon Studio with remote mode, on the logon page the Update button is displayed: click this button to install the patch.
+
+### Installing the patch using Talend Studio
+
+1) Create a folder named "patches" under your studio installer directory and copy the patch .zip file to this folder.
+
+2) Restart your studio: a window pops up, then click OK to install the patch, or restart the commandline and the patch will be installed automatically.
+
+### Installing the patch using Commandline
+
+Execute the following commands:
+
+1. Talend-Studio-win-x86_64.exe -nosplash -application org.talend.commandline.CommandLine -consoleLog -data commandline-workspace startServer -p 8002 --talendDebug
+2. initRemote {tac_url} -ul {TAC login username} -up {TAC login password}
+3. checkAndUpdate -tu {TAC login username} -tup {TAC login password}
--- a/main/plugins/org.talend.designer.components.localprovider/components/tLibraryLoad/tLibraryLoad_begin.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tLibraryLoad/tLibraryLoad_begin.javajet
@@ -17,19 +17,17 @@

 <% if(hotLibs!=null&&hotLibs.size() > 0){%>

-String[] libPaths_<%=cid %> = new String[] { <% for(Map<String, String> item : hotLibs) {%> <%=item.get("LIBPATH") %>, <%}%> };
+java.net.URLClassLoader sysloader_<%=cid %> = (java.net.URLClassLoader) ClassLoader.getSystemClassLoader();
+java.lang.reflect.Method method_<%=cid %> = java.net.URLClassLoader.class.getDeclaredMethod("addURL", new Class[] { java.net.URL.class });
+method_<%=cid %>.setAccessible(true);

-java.util.List<java.net.URL> libURL_<%=cid %> = new java.util.ArrayList<>();
-
-for(String lib_<%=cid %>:libPaths_<%=cid %>) {
+String[] libPaths_<%=cid %> = new String[] { <% for(Map<String, String> item : hotLibs){%> <%=item.get("LIBPATH") %>, <%}%> };
+for(String lib_<%=cid %>:libPaths_<%=cid %> ){
 	String separator_<%=cid %> = System.getProperty("path.separator");
 	String[] jarFiles_<%=cid %> = lib_<%=cid %>.split(separator_<%=cid %>);	
-	for(String jarFile_<%=cid %> : jarFiles_<%=cid %>) {
-		libURL_<%=cid %>.add( new java.io.File(jarFile_<%=cid %>).toURI().toURL() );
+	for(String jarFile_<%=cid %>:jarFiles_<%=cid %>){		
+		method_<%=cid %>.invoke(sysloader_<%=cid %>, new Object[] { new java.io.File(jarFile_<%=cid %>).toURL() });
 	}
 }
-java.net.URL[] libURLArray_<%=cid %> = libURL_<%=cid %>.toArray(new java.net.URL[] {});
-ClassLoader threadClassLoader_<%=cid %> = Thread.currentThread().getContextClassLoader();
-java.net.URLClassLoader newthreadClassLoader_<%=cid %> = new java.net.URLClassLoader(libURLArray_<%=cid %>, threadClassLoader_<%=cid %>);
-Thread.currentThread().setContextClassLoader(newthreadClassLoader_<%=cid %>);
+
 <%}%>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftBulkExec/tRedshiftBulkExec_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftBulkExec/tRedshiftBulkExec_java.xml
@@ -419,7 +419,7 @@
 				UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar"
 				REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="commons-codec-1.6.jar" MODULE="commons-codec-1.6.jar"
-				MVN="mvn:org.talend.libraries/commons-codec-1.6/6.0.0"
+				MVN="mvn:commons-codec/commons-codec/1.6"
 				UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.6.jar"
 				REQUIRED="true" />
 		</IMPORTS>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftConnection/tRedshiftConnection_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftConnection/tRedshiftConnection_java.xml
@@ -207,6 +207,7 @@
        <IMPORT NAME="httpcore-4.4.9.jar" MODULE="httpcore-4.4.9.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.9" REQUIRED_IF="(JDBC_URL == 'SSO')" />
        <IMPORT NAME="httpclient-4.5.5.jar" MODULE="httpclient-4.5.5.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.5" REQUIRED_IF="(JDBC_URL == 'SSO')" />
        <IMPORT NAME="joda-time-2.8.1.jar" MODULE="joda-time-2.8.1.jar" MVN="mvn:joda-time/joda-time/2.8.1" REQUIRED_IF="(JDBC_URL == 'SSO')" />
+        <IMPORT NAME="commons-codec-1.6.jar" MODULE="commons-codec-1.6.jar" MVN="mvn:commons-codec/commons-codec/1.6" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.6.jar" REQUIRED_IF="(JDBC_URL == 'SSO')" />
      </IMPORTS>
    </CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftInput/tRedshiftInput_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftInput/tRedshiftInput_java.xml
@@ -288,6 +288,7 @@
        <IMPORT NAME="httpcore-4.4.9.jar" MODULE="httpcore-4.4.9.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.9" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
        <IMPORT NAME="httpclient-4.5.5.jar" MODULE="httpclient-4.5.5.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.5" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
        <IMPORT NAME="joda-time-2.8.1.jar" MODULE="joda-time-2.8.1.jar" MVN="mvn:joda-time/joda-time/2.8.1" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="commons-codec-1.6.jar" MODULE="commons-codec-1.6.jar" MVN="mvn:commons-codec/commons-codec/1.6" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.6.jar" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
     </IMPORTS>
   </CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftOutput/tRedshiftOutput_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftOutput/tRedshiftOutput_java.xml
@@ -378,6 +378,7 @@
        <IMPORT NAME="httpcore-4.4.9.jar" MODULE="httpcore-4.4.9.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.9" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
        <IMPORT NAME="httpclient-4.5.5.jar" MODULE="httpclient-4.5.5.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.5" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
        <IMPORT NAME="joda-time-2.8.1.jar" MODULE="joda-time-2.8.1.jar" MVN="mvn:joda-time/joda-time/2.8.1" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="commons-codec-1.6.jar" MODULE="commons-codec-1.6.jar" MVN="mvn:commons-codec/commons-codec/1.6" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.6.jar" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
     </IMPORTS>
   </CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftOutputBulkExec/tRedshiftOutputBulkExec_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftOutputBulkExec/tRedshiftOutputBulkExec_java.xml
@@ -538,7 +538,7 @@
 				UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar"
 				REQUIRED="true" />
 			<IMPORT NAME="commons-codec-1.6.jar" MODULE="commons-codec-1.6.jar"
-				MVN="mvn:org.talend.libraries/commons-codec-1.6/6.0.0"
+				MVN="mvn:commons-codec/commons-codec/1.6"
 				UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.6.jar"
 				REQUIRED="true" />
 		</IMPORTS>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftRow/tRedshiftRow_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftRow/tRedshiftRow_java.xml
@@ -306,6 +306,7 @@
        <IMPORT NAME="httpcore-4.4.9.jar" MODULE="httpcore-4.4.9.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.9" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
        <IMPORT NAME="httpclient-4.5.5.jar" MODULE="httpclient-4.5.5.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.5" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
        <IMPORT NAME="joda-time-2.8.1.jar" MODULE="joda-time-2.8.1.jar" MVN="mvn:joda-time/joda-time/2.8.1" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="commons-codec-1.6.jar" MODULE="commons-codec-1.6.jar" MVN="mvn:commons-codec/commons-codec/1.6" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.6.jar" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
     </IMPORTS>
   </CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftUnload/tRedshiftUnload_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftUnload/tRedshiftUnload_java.xml
@@ -281,6 +281,7 @@
            <IMPORT NAME="httpcore-4.4.9.jar" MODULE="httpcore-4.4.9.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.9" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
            <IMPORT NAME="httpclient-4.5.5.jar" MODULE="httpclient-4.5.5.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.5" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
            <IMPORT NAME="joda-time-2.8.1.jar" MODULE="joda-time-2.8.1.jar" MVN="mvn:joda-time/joda-time/2.8.1" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="commons-codec-1.6.jar" MODULE="commons-codec-1.6.jar" MVN="mvn:commons-codec/commons-codec/1.6" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.6.jar" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
        </IMPORTS>
    </CODEGENERATION>
 	<RETURNS />