Compare commits

..

2 Commits

Author SHA1 Message Date
pyzhou-talend
fccf5babe4 patch(TPS-3175) 2019-05-30 17:12:08 +08:00
pyzhou
2c0fdbd6b0 fix(TDI-39376):Import the jar to eliminate compile error. (#1621) 2019-05-30 17:05:58 +08:00
3 changed files with 20 additions and 17 deletions

View File

@@ -5,13 +5,13 @@ product:
- https://talend.poolparty.biz/coretaxonomy/23
---
# TPS-3231
# TPS-3175
| Info | Value |
| ---------------- | ---------------- |
| Patch Name | Patch\_20190703_TPS-3231\_v1-6.4.1 |
| Release Date | 2019-07-03 |
| Target Version | Talend-Studio-20170623\_1246-V6.4.1 |
| Patch Name | Patch\_20190530\_TPS\-3175\_v1\-6.4.1 |
| Release Date | 2019-05-30 |
| Target Version | Talend-Studio-20170623_1246-V6.4.1 |
| Product affected | Talend Studio |
## Introduction
@@ -24,7 +24,7 @@ This is a self-contained patch.
This patch contains the following fixes:
- TPS-3231 [6.4.1] tFileFetch not able to connect internet behind NTLM PROXY (TDI-42536)
- TPS-3175 [6.4.1] "oracle.jdbc cannot be resolved to a type" when enabling "Data source alias" on tOracleInput (TDI-39376)
## Prerequisites
@@ -32,7 +32,6 @@ Consider the following requirements for your system:
- Talend Studio 6.4.1 must be installed.
## Installation
### Installing the patch using Software update
@@ -57,11 +56,18 @@ Execute the following commands:
2. initRemote {tac_url} -ul {TAC login username} -up {TAC login password}
3. checkAndUpdate -tu {TAC login username} -tup {TAC login password}
## Uninstallation
## Uninstallation <!-- if applicable -->
<!--
Detailed instructions to uninstall the patch
In case this patch cannot be uninstalled, it is your responsability to define the backup procedures for your organization before installing.
-->
Backup the Affected files list below. Uninstall the patch by restore the backup files.
## Affected files for this patch
## Affected files for this patch <!-- if applicable -->
The following files are installed by this patch:
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_6.4.1.20170623\_1246/components/tFileFetch/tFileFetch\_main.javajet
- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_6.4.1.20170623\_1246/components/tOracleInput/tOracleInput\_java.xml

View File

@@ -210,9 +210,6 @@ if ("http".equals(protocol) || "https".equals(protocol)) {
client_<%=cid %>.getState().setProxyCredentials(
new org.apache.commons.httpclient.auth.AuthScope(<%=proxyHost %>, Integer.parseInt(<%=proxyPort%>), null),
new org.apache.commons.httpclient.UsernamePasswordCredentials(<%=proxyUser %>, decryptedPassword_<%=cid%>));
java.util.List<String> authPrefs_<%=cid %> = java.util.Collections.singletonList(org.apache.commons.httpclient.auth.AuthPolicy.BASIC);
client_<%=cid %>.getParams().setParameter(org.apache.commons.httpclient.auth.AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs_<%=cid %>);
<%}
}

View File

@@ -216,11 +216,11 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Oracle8i" MODULE="ojdbc12.jar" MVN="mvn:org.talend.libraries/ojdbc12/6.0.0" BundleID="" REQUIRED_IF="(DB_VERSION == 'ORACLE_8') AND (USE_EXISTING_CONNECTION == 'false') AND (SPECIFY_DATASOURCE_ALIAS == 'false')" />
<IMPORT NAME="Driver-Oracle9i" MODULE="ojdbc14-9i.jar" MVN="mvn:org.talend.libraries/ojdbc14-9i/6.0.0" BundleID="" REQUIRED_IF="(DB_VERSION == 'ORACLE_9') AND (USE_EXISTING_CONNECTION == 'false') AND (SPECIFY_DATASOURCE_ALIAS == 'false')" />
<IMPORT NAME="Driver-Oracle10g" MODULE="ojdbc14.jar" MVN="mvn:org.talend.libraries/ojdbc14/6.0.0" BundleID="" REQUIRED_IF="(DB_VERSION == 'ORACLE_10') AND (USE_EXISTING_CONNECTION == 'false') AND (SPECIFY_DATASOURCE_ALIAS == 'false')" />
<IMPORT NAME="Driver-Oracle11g-1" MODULE="ojdbc6.jar" MVN="mvn:org.talend.libraries/ojdbc6/6.0.0" BundleID="" REQUIRED_IF="(DB_VERSION == 'ORACLE_11') AND (USE_EXISTING_CONNECTION == 'false') AND (SPECIFY_DATASOURCE_ALIAS == 'false')" />
<IMPORT NAME="Driver-Oracle11g-2" MODULE="ojdbc6.jar" MVN="mvn:org.talend.libraries/ojdbc6/6.0.0" BundleID="" REQUIRED_IF="(DB_VERSION == 'ORACLE_11-6') AND (USE_EXISTING_CONNECTION == 'false') AND (SPECIFY_DATASOURCE_ALIAS == 'false')" />
<IMPORT NAME="Driver-Oracle12c" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0" BundleID="" REQUIRED_IF="(DB_VERSION == 'ORACLE_12') AND (USE_EXISTING_CONNECTION == 'false') AND (SPECIFY_DATASOURCE_ALIAS == 'false')" />
<IMPORT NAME="Driver-Oracle9i" MODULE="ojdbc14-9i.jar" MVN="mvn:org.talend.libraries/ojdbc14-9i/6.0.0" BundleID="" REQUIRED_IF="(DB_VERSION == 'ORACLE_9') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Oracle10g" MODULE="ojdbc14.jar" MVN="mvn:org.talend.libraries/ojdbc14/6.0.0" BundleID="" REQUIRED_IF="(DB_VERSION == 'ORACLE_10') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Oracle11g-1" MODULE="ojdbc6.jar" MVN="mvn:org.talend.libraries/ojdbc6/6.0.0" BundleID="" REQUIRED_IF="(DB_VERSION == 'ORACLE_11') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Oracle11g-2" MODULE="ojdbc6.jar" MVN="mvn:org.talend.libraries/ojdbc6/6.0.0" BundleID="" REQUIRED_IF="(DB_VERSION == 'ORACLE_11-6') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Oracle12c" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0" BundleID="" REQUIRED_IF="(DB_VERSION == 'ORACLE_12') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Oracle-XDB" MODULE="xdb.jar" MVN="mvn:org.talend.libraries/xdb/6.0.0" REQUIRED_IF="SCHEMA.DB_TYPE IN ['XMLTYPE']" />
<IMPORT NAME="Driver-Oracle-XMLPARSERV2" MODULE="xmlparserv2.jar" MVN="mvn:org.talend.libraries/xmlparserv2/6.0.0" BundleID="" REQUIRED_IF="SCHEMA.DB_TYPE IN ['XMLTYPE']" />
<IMPORT NAME="Talend-oracle-timestamptz" MODULE="talend-oracle-timestamptz.jar" MVN="mvn:org.talend.libraries/talend-oracle-timestamptz/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend-oracle-timestamptz.jar" REQUIRED_IF="(DB_VERSION == 'ORACLE_11-6') OR (DB_VERSION=='ORACLE_11') OR (DB_VERSION=='ORACLE_10')" />