Compare commits

...

25 Commits

Author SHA1 Message Date
dochkas-talend
36c32b6437 added bigger timeout 2022-06-20 17:51:57 +03:00
msjian
b5f96496f4 fix(TDQ-19435): fix a NPE (#7663) 2022-06-20 10:01:55 +08:00
zshen-talend
d0fbe0defa fix(TDQ-19623): make sure project name never force lowercase (#7661) 2022-06-17 10:17:23 +08:00
sponomarova
d9454a11ef feat(TBD-13823): spark local 3.2.x GA (#7652) (#7656) 2022-06-16 12:52:54 +03:00
zshen-talend
bca8dd8802 fix(TDQ-19623): make sure build job action work for reference project (#7654) 2022-06-15 18:18:37 +08:00
Dmytro Sylaiev
45c4e32c2a feat(TDI-47398): migrate adal4j to msal4j mscrm (#7556)
* feat(TDI-47398): Change adal4j to msal4j for talend-mscrm

* feat(TDI-47398): Change dependencies for tMicrosoftCRMXXX

* feat(TDI-47398): Implement oauth token acquiring

* chore(TDI-47398): Small microbes fix
2022-06-14 22:21:51 +03:00
hcyi
e637d53155 fix(TUP-35508):Better to improve context prompt for JDBC. (#7624)
* fix(TUP-35508):Better to improve context prompt for JDBC.

* fix(TUP-35508):Better to improve context prompt for JDBC.

* fix(TUP-35508):Better to improve context prompt for JDBC.

* fix(TUP-35508):Better to improve context prompt for JDBC.

* fix(TUP-35508):Better to improve context prompt for JDBC.
2022-06-14 15:08:33 +08:00
wang wei
537bd1b73a fix(TCOMP-2122): [JDBC TCK]: can't get user defined schema info in tck runtime in studio when no data outut line 2022-06-14 13:56:21 +08:00
Laurent BOURGEOIS
2fcf4be1e2 fix(TBD-13581):tHiveConnection doesn't support spark 3.1.x dataproc 2.0.x (#7646) 2022-06-10 14:33:51 +02:00
Jane Ding
86ee3f4ad1 feat(TUP-33085):Add Icon(s) to open Help (#7571) (#7643)
* feat(TUP-33085):Add Icon(s) to open Help
https://jira.talendforge.org/browse/TUP-33085

* feat(TUP-33085):Add Icon(s) to open Help
https://jira.talendforge.org/browse/TUP-33085
fix(TUP-35782):[bug] button 'Online help' can't work for some TCK
components
https://jira.talendforge.org/browse/TUP-35782
2022-06-10 17:25:55 +08:00
Xuwei ZHU
106c010d53 Add localized files (#7642)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-06-09 19:08:34 +08:00
Alexiane Yvonet
80917277a5 Add localized files (#7640)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-06-09 19:08:21 +08:00
Dmytro Sylaiev
f0fe150ec0 fix(TDI-47951): Don't set null passw for sso auth (#7580)
* fix(TDI-47951): Don't set null passw for sso auth

* fix(TDI-47951): Handle possible NPE

* For tRedshiftUnload and tRedshiftBE/OBE
2022-06-09 13:44:22 +03:00
Dmytro Grygorenko
46523080d3 fix(TDI-47935): bump "nimbus-jose-jwt" lib to fix CVE. (#7522) 2022-06-09 10:32:59 +03:00
jiezhang-tlnd
68b5e9e7c4 export dataset need with datastore (#7579) (#7639)
* export dataset need with datastore

* issue is that deleting datastore but dataset not be deleted

* fix selection issue on export wizard

* fomat code

* format code

* improve performance

* improve performance by adding objectType

* improve code and handle import issue

* code format
2022-06-09 10:58:42 +08:00
Chao MENG
c3b1df17a0 item(TUP-35556): Handle demo feedbacks for update from TMC (#7595)
https://jira.talendforge.org/browse/TUP-35556
2022-06-09 10:50:06 +08:00
msjian
d7af0fc449 Revert "fix(TDQ-20476): fix match analysis run get error (#7622)" (#7633)
This reverts commit fd2c8b365b.
2022-06-08 16:21:22 +08:00
jiezhang-tlnd
c2408e4223 fix(TUP-35683)doc use job for route, joblet for routelet (#7630) (#7636)
https://jira.talendforge.org/browse/TUP-35683
2022-06-08 15:35:19 +08:00
sbieliaievl
2ec3561107 fix(APPINT-24774) - POST/PUT operations when importing API in tRESTRequest should declare a body parameter (#7518)
* fix(APPINT-24774) - POST/PUT operations when importing API in
tRESTRequest should declare a body parameter

* fix(APPINT-24774) - POST/PUT operations when importing API in
tRESTRequest should declare a body parameter
2022-06-08 08:46:55 +03:00
jiezhang-tlnd
acc3c15744 feat(TUP-34931)Support Sybase 17 (#7620) (#7632) 2022-06-08 10:59:30 +08:00
msjian
fd2c8b365b fix(TDQ-20476): fix match analysis run get error (#7622) 2022-06-07 18:59:12 +08:00
wang wei
cb369968e9 fix(TDI-48037): CVE: org.postgresql:postgresql:42.2.14 (#7573) (#7629) 2022-06-07 17:57:32 +08:00
jzhangbj
70f018b26f Add localized files (#7611)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-06-06 09:32:59 +08:00
tsasada-talend
f6a4d9022f Add localized files (#7610)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-06-06 09:31:59 +08:00
Alexiane Yvonet
616815d794 Add localized files (#7609)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-06-06 09:30:39 +08:00
104 changed files with 882 additions and 310 deletions

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.components</groupId>
<artifactId>talend-mscrm</artifactId>
<version>3.11-20220401</version>
<version>3.12-20220513</version>
<packaging>jar</packaging>
<name>talend-mscrm</name>
@@ -34,7 +34,7 @@
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
</properties>
<repositories>
<repository>
<id>talend_nexus_deployment</id>
@@ -69,7 +69,7 @@
</releases>
</repository>
</distributionManagement>
<dependencies>
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -102,7 +102,7 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-client-core</artifactId>
@@ -144,11 +144,6 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>adal4j</artifactId>
<version>${adal4j.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
@@ -164,6 +159,17 @@
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>msal4j</artifactId>
<version>1.11.2</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.9.0</version>
</dependency>
</dependencies>
<build>
<resources>

View File

@@ -0,0 +1,164 @@
package com.microsoft.aad.msal4j;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import org.slf4j.LoggerFactory;
import com.nimbusds.oauth2.sdk.ParseException;
import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
import com.nimbusds.oauth2.sdk.auth.ClientAuthenticationMethod;
import com.nimbusds.oauth2.sdk.auth.ClientSecretPost;
import com.nimbusds.oauth2.sdk.auth.PrivateKeyJWT;
import com.nimbusds.oauth2.sdk.auth.Secret;
import com.nimbusds.oauth2.sdk.id.ClientID;
import static com.microsoft.aad.msal4j.ParameterValidationUtils.validateNotNull;
public class OauthClientApplication extends AbstractClientApplicationBase implements IConfidentialClientApplication {
private ClientAuthentication clientAuthentication;
private CustomJWTAuthentication customJWTAuthentication;
private boolean clientCertAuthentication = false;
private ClientCertificate clientCertificate;
private boolean sendX5c;
private final String username;
private final String password;
private OauthClientApplication(OauthClientApplication.Builder builder) {
super(builder);
validateNotNull("username", builder.username);
validateNotNull("password", builder.password);
sendX5c = builder.sendX5c;
log = LoggerFactory.getLogger(ConfidentialClientApplication.class);
initClientAuthentication(builder.clientCredential);
this.username = builder.username;
this.password = builder.password;
}
@Override
public CompletableFuture<IAuthenticationResult> acquireToken(ClientCredentialParameters parameters) {
validateNotNull("parameters", parameters);
RequestContext context = new RequestContext(this, PublicApi.ACQUIRE_TOKEN_FOR_CLIENT, parameters);
OauthCredentialRequest clientCredentialRequest = new OauthCredentialRequest(parameters,
username, password,this, context);
return this.executeRequest(clientCredentialRequest);
}
@Override
public CompletableFuture<IAuthenticationResult> acquireToken(OnBehalfOfParameters parameters) {
throw new IllegalStateException("Use ConfidentialClientApplication instead");
}
private void initClientAuthentication(IClientCredential clientCredential) {
validateNotNull("clientCredential", clientCredential);
if (clientCredential instanceof ClientSecret) {
clientAuthentication = new ClientSecretPost(new ClientID(clientId()), new Secret(((ClientSecret) clientCredential).clientSecret()));
} else if (clientCredential instanceof ClientCertificate) {
this.clientCertAuthentication = true;
this.clientCertificate = (ClientCertificate) clientCredential;
clientAuthentication = buildValidClientCertificateAuthority();
} else if (clientCredential instanceof ClientAssertion) {
clientAuthentication = createClientAuthFromClientAssertion((ClientAssertion) clientCredential);
} else {
throw new IllegalArgumentException("Unsupported client credential");
}
}
@Override
protected ClientAuthentication clientAuthentication() {
if (clientCertAuthentication) {
final Date currentDateTime = new Date(System.currentTimeMillis());
final Date expirationTime = ((PrivateKeyJWT) clientAuthentication).getJWTAuthenticationClaimsSet().getExpirationTime();
if (expirationTime.before(currentDateTime)) {
//The asserted private jwt with the client certificate can expire so rebuild it when the
clientAuthentication = buildValidClientCertificateAuthority();
}
}
return clientAuthentication;
}
private ClientAuthentication buildValidClientCertificateAuthority() {
ClientAssertion clientAssertion = JwtHelper.buildJwt(clientId(), clientCertificate, this.authenticationAuthority.selfSignedJwtAudience(), sendX5c);
return createClientAuthFromClientAssertion(clientAssertion);
}
private ClientAuthentication createClientAuthFromClientAssertion(final ClientAssertion clientAssertion) {
final Map<String, List<String>> map = new HashMap<>();
try {
map.put("client_assertion_type", Collections.singletonList(ClientAssertion.assertionType));
map.put("client_assertion", Collections.singletonList(clientAssertion.assertion()));
return PrivateKeyJWT.parse(map);
} catch (final ParseException e) {
//This library is not supposed to validate Issuer and subject values.
//The next lines of code ensures that exception is not thrown.
if (e.getMessage().contains("Issuer and subject in client JWT assertion must designate the same client identifier")) {
return new CustomJWTAuthentication(ClientAuthenticationMethod.PRIVATE_KEY_JWT, clientAssertion, new ClientID(clientId()));
}
throw new MsalClientException(e);
}
}
/**
* Creates instance of Builder of ConfidentialClientApplication
*
* @param clientId Client ID (Application ID) of the application as registered
* in the application registration portal (portal.azure.com)
* @param clientCredential The client credential to use for token acquisition.
* @return instance of Builder of ConfidentialClientApplication
*/
public static OauthClientApplication.Builder builder(String clientId, IClientCredential clientCredential, String username, String password) {
return new OauthClientApplication.Builder(clientId, clientCredential, username, password);
}
public static class Builder extends AbstractClientApplicationBase.Builder<OauthClientApplication.Builder> {
private IClientCredential clientCredential;
private final String username;
private final String password;
private boolean sendX5c = true;
private Builder(String clientId, IClientCredential clientCredential, String username, String password) {
super(clientId);
this.clientCredential = clientCredential;
this.username = username;
this.password = password;
}
/**
* Specifies if the x5c claim (public key of the certificate) should be sent to the STS.
* Default value is true
*
* @param val true if the x5c should be sent. Otherwise false
* @return instance of the Builder on which method was called
*/
public OauthClientApplication.Builder sendX5c(boolean val) {
this.sendX5c = val;
return self();
}
@Override
public OauthClientApplication build() {
return new OauthClientApplication(this);
}
@Override
protected OauthClientApplication.Builder self() {
return this;
}
}
@java.lang.SuppressWarnings("all")
public boolean sendX5c() {
return this.sendX5c;
}
}

View File

@@ -0,0 +1,20 @@
package com.microsoft.aad.msal4j;
import com.nimbusds.oauth2.sdk.ResourceOwnerPasswordCredentialsGrant;
import com.nimbusds.oauth2.sdk.auth.Secret;
class OauthCredentialRequest extends MsalRequest {
ClientCredentialParameters parameters;
OauthCredentialRequest(ClientCredentialParameters parameters, String username, String password,
OauthClientApplication application, RequestContext requestContext) {
super(application, createMsalGrant(parameters, username, password), requestContext);
this.parameters = parameters;
}
private static OAuthAuthorizationGrant createMsalGrant(ClientCredentialParameters parameters,
String username, String password) {
return new OAuthAuthorizationGrant(new ResourceOwnerPasswordCredentialsGrant(username, new Secret(
password)), parameters.scopes(), parameters.claims());
}
}

View File

@@ -13,14 +13,12 @@
package org.talend.ms.crm.odata.authentication;
import java.net.Proxy;
import java.util.Collections;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import javax.naming.AuthenticationException;
import javax.naming.ServiceUnavailableException;
import com.microsoft.aad.adal4j.ClientCredential;
import org.apache.http.client.methods.HttpRequestBase;
import org.apache.olingo.client.api.communication.request.ODataRequest;
import org.apache.olingo.commons.api.http.HttpHeader;
@@ -28,15 +26,19 @@ import org.talend.ms.crm.odata.ClientConfiguration;
import org.talend.ms.crm.odata.ProxyProvider;
import org.talend.ms.crm.odata.httpclientfactory.IHttpclientFactoryObservable;
import org.talend.ms.crm.odata.httpclientfactory.OAuthHttpClientFactory;
import com.microsoft.aad.adal4j.AuthenticationContext;
import com.microsoft.aad.adal4j.AuthenticationResult;
import com.microsoft.aad.msal4j.ClientCredentialFactory;
import com.microsoft.aad.msal4j.ClientCredentialParameters;
import com.microsoft.aad.msal4j.ConfidentialClientApplication;
import com.microsoft.aad.msal4j.IAuthenticationResult;
import com.microsoft.aad.msal4j.OauthClientApplication;
import com.microsoft.aad.msal4j.PublicClientApplication;
import com.microsoft.aad.msal4j.UserNamePasswordParameters;
public class OAuthStrategyImpl implements IAuthStrategy {
private ClientConfiguration conf;
private AuthenticationResult authResult;
private IAuthenticationResult authResult;
private IHttpclientFactoryObservable httpClientFactory;
@@ -71,12 +73,12 @@ public class OAuthStrategyImpl implements IAuthStrategy {
@Override
public void configureRequest(ODataRequest request) {
request.addCustomHeader(HttpHeader.AUTHORIZATION, "Bearer " + authResult.getAccessToken());
request.addCustomHeader(HttpHeader.AUTHORIZATION, "Bearer " + authResult.accessToken());
}
@Override
public void configureRequest(HttpRequestBase request) {
request.addHeader(HttpHeader.AUTHORIZATION, "Bearer " + authResult.getAccessToken());
request.addHeader(HttpHeader.AUTHORIZATION, "Bearer " + authResult.accessToken());
}
@Override
@@ -115,34 +117,71 @@ public class OAuthStrategyImpl implements IAuthStrategy {
}
}
private Future<AuthenticationResult> acquireToken(AuthenticationContext context) throws Exception {
Future<AuthenticationResult> future;
private Future<IAuthenticationResult> acquireToken(PublicClientApplication context) throws Exception {
Future<IAuthenticationResult> future;
UserNamePasswordParameters parameters = UserNamePasswordParameters.builder(
Collections.singleton(conf.getResource() + "/.default"), conf.getUserName(), conf.getPassword().toCharArray()).build();
future = context.acquireToken(parameters);
return future;
if(conf.getAppRegisteredType() == ClientConfiguration.AppRegisteredType.NATIVE_APP){
future = context.acquireToken(conf.getResource(), conf.getClientId(), conf.getUserName(), conf.getPassword(), null);
}
else if(conf.getAppRegisteredType() == ClientConfiguration.AppRegisteredType.WEB_APP && conf.getWebAppPermission() == ClientConfiguration.WebAppPermission.DELEGATED){
future = context.acquireToken(conf.getResource(), new ClientCredential(conf.getClientId(), conf.getClientSecret()), conf.getUserName(), conf.getPassword(), null);
}
else{
throw new Exception("Can't retrieve token with this configuration : registered application type: "+conf.getAppRegisteredType()+", Web application permission: "+conf.getWebAppPermission());
}
return future;
}
private Future<IAuthenticationResult> acquireToken(OauthClientApplication context) throws Exception {
ClientCredentialParameters parameters = ClientCredentialParameters.builder(
Collections.singleton(conf.getResource() + "/.default")).build();
return context.acquireToken(parameters);
}
private AuthenticationResult getAccessToken() throws ServiceUnavailableException {
AuthenticationContext context = null;
AuthenticationResult result = null;
private IAuthenticationResult getAccessToken() throws ServiceUnavailableException {
if(conf.getAppRegisteredType() == ClientConfiguration.AppRegisteredType.NATIVE_APP){
return getAccessTokenNative();
} if(conf.getAppRegisteredType() == ClientConfiguration.AppRegisteredType.WEB_APP && conf.getWebAppPermission() == ClientConfiguration.WebAppPermission.DELEGATED){
return getAccessTokenWebApp();
} else {
throw new RuntimeException("Can't retrieve token with this configuration : registered application type: "+conf.getAppRegisteredType()+", Web application permission: "+conf.getWebAppPermission());
}
}
private IAuthenticationResult getAccessTokenNative() throws ServiceUnavailableException {
PublicClientApplication context = null;
IAuthenticationResult result = null;
ExecutorService service = null;
try {
service = Executors.newFixedThreadPool(1);
context = new AuthenticationContext(conf.getAuthoryEndpoint(), false, service);
Proxy proxy = ProxyProvider.getProxy();
PublicClientApplication.Builder contextBuilder = PublicClientApplication.builder(conf.getClientId()).authority("https://login.microsoftonline.com/organizations");
if (proxy != null) {
contextBuilder = contextBuilder.proxy(proxy);
}
context = contextBuilder.build();
Future<IAuthenticationResult> future = this.acquireToken(context);
result = future.get();
} catch (Exception e) {
throw new ServiceUnavailableException(e.getMessage());
} finally {
service.shutdown();
}
if (result == null) {
throw new ServiceUnavailableException("Authenticated failed! Please check your configuration!");
}
return result;
}
private IAuthenticationResult getAccessTokenWebApp() throws ServiceUnavailableException {
OauthClientApplication context = null;
IAuthenticationResult result = null;
ExecutorService service = null;
try {
service = Executors.newFixedThreadPool(1);
OauthClientApplication.Builder contextBuilder = OauthClientApplication.builder(conf.getClientId(),
ClientCredentialFactory.createFromSecret(conf.getClientSecret()), conf.getUserName(), conf.getPassword())
.authority(conf.getAuthoryEndpoint());
Proxy proxy = ProxyProvider.getProxy();
if (proxy != null) {
context.setProxy(proxy);
contextBuilder.proxy(proxy);
}
Future<AuthenticationResult> future = this.acquireToken(context);
context = contextBuilder.build();
Future<IAuthenticationResult> future = this.acquireToken(context);
result = future.get();
} catch (Exception e) {
throw new ServiceUnavailableException(e.getMessage());

View File

@@ -395,7 +395,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -278,7 +278,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -349,7 +349,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -334,7 +334,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -14,7 +14,7 @@ ACCESS_TOKEN.NAME=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
DATASET.NAME=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8
TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
CREATE_TABLE_IF_NOT_EXIST.NAME=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3057\u306A\u3051\u308C\u3070\u4F5C\u6210
CREATE_TABLE_IF_NOT_EXIST.NAME=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u4F5C\u6210
ACTION_ON_DATA.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
ACTION_ON_DATA.ITEM.APPEND=\u8FFD\u52A0
ACTION_ON_DATA.ITEM.TRUNCATE=\u5168\u524A\u9664

View File

@@ -29,7 +29,7 @@ ACCESS_TOKEN.NAME=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
DATASET.NAME=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8
TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
CREATE_TABLE_IF_NOT_EXIST.NAME=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3057\u306A\u3051\u308C\u3070\u4F5C\u6210
CREATE_TABLE_IF_NOT_EXIST.NAME=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u4F5C\u6210
ACTION_ON_DATA.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
ACTION_ON_DATA.ITEM.APPEND=\u8FFD\u52A0
ACTION_ON_DATA.ITEM.TRUNCATE=\u5168\u524A\u9664

View File

@@ -858,7 +858,7 @@
<IMPORT NAME="asm" MODULE="asm-9.1.jar" MVN="mvn:org.ow2.asm/asm/9.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
<IMPORT NAME="Driver-MYSQL5" MODULE="mysql-connector-java-5.1.49.jar" MVN="mvn:mysql/mysql-connector-java/5.1.49" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') and (DBTYPE=='MYSQL') and (DB_MYSQL_VERSION=='MYSQL_5')"/>
<IMPORT NAME="Driver-MYSQL8" MODULE="mysql-connector-java-8.0.18.jar" MVN="mvn:mysql/mysql-connector-java/8.0.18" REQUIRED_IF="(DB_MYSQL_VERSION == 'MYSQL_8') AND (USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MYSQL')" />
@@ -870,7 +870,7 @@
<IMPORT NAME="Driver-Oracle12c" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0" REQUIRED_IF="(DBTYPE=='DBORACLE') AND (DB_VERSION == 'ORACLE_12') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="ORACLE_18" MODULE="ojdbc8-19.3.0.0.jar" MVN="mvn:com.oracle.ojdbc/ojdbc8/19.3.0.0" REQUIRED_IF="(DBTYPE=='DBORACLE') AND (DB_VERSION == 'ORACLE_18') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-POSTGRESQL" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) AND (DB_POSTGRE_VERSION =='PRIOR_TO_V9')) or (DBTYPE=='GREENPLUM'))" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) AND (DB_POSTGRE_VERSION =='V9_X'))" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) AND (DB_POSTGRE_VERSION =='V9_X'))" />
<IMPORT NAME="Driver-FIREBIRD" MODULE="jaybird-full-2.1.1.jar" MVN="mvn:org.talend.libraries/jaybird-full-2.1.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.jdbc.firebird/lib/jaybird-full-2.1.1.jar" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='FIREBIRD')" />
<IMPORT NAME="Driver-HSQLDb" MODULE="hsqldb.jar" MVN="mvn:org.talend.libraries/hsqldb/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.jdbc.hsql/lib/hsqldb.jar" REQUIRED_IF="DBTYPE=='HSQLDB'"/>
<IMPORT NAME="Driver-INFORMIX-JDBC" MODULE="ifxjdbc.jar" MVN="mvn:org.talend.libraries/ifxjdbc/6.0.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INFORMIX')" />

View File

@@ -132,7 +132,7 @@ MSSQL_DRIVER.ITEM.MSSQL_PROP=Microsoft
DB_SYBASE_VERSION.NAME=Version de la base de donn\u00E9es
DB_SYBASE_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures
ACCOUNT.NAME=Compte
ROLE.NAME=R\u00F4le
ENFORCE_DELIMITED_IDENTIFIERS.NAME=Impl\u00E9menter les identifiants d\u00E9limit\u00E9s de base de donn\u00E9es

View File

@@ -132,7 +132,7 @@ MSSQL_DRIVER.ITEM.MSSQL_PROP=Microsoft
DB_SYBASE_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
DB_SYBASE_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)\u4EE5\u964D
ACCOUNT.NAME=\u30A2\u30AB\u30A6\u30F3\u30C8
ROLE.NAME=\u30ED\u30FC\u30EB
ENFORCE_DELIMITED_IDENTIFIERS.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u533A\u5207\u308A\u4ED8\u304D\u8B58\u5225\u5B50\u306E\u5F37\u5236

View File

@@ -132,7 +132,7 @@ MSSQL_DRIVER.ITEM.MSSQL_PROP=Microsoft
DB_SYBASE_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
DB_SYBASE_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) \u53CA\u66F4\u9AD8\u7248\u672C
ACCOUNT.NAME=\u5E10\u6237
ROLE.NAME=\u89D2\u8272
ENFORCE_DELIMITED_IDENTIFIERS.NAME=\u6267\u884C\u6570\u636E\u5E93\u5206\u9694\u578B\u6807\u8BC6\u7B26

View File

@@ -212,7 +212,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -189,7 +189,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="DB_VERSION =='V9_X'" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="DB_VERSION =='V9_X'" />
<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="DB_VERSION =='PRIOR_TO_V9'" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -20,4 +20,4 @@ CONNECTION.NAME=Liste des composants
DB_VERSION.NAME=Version de la base de donn\u00E9es
DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures

View File

@@ -3,7 +3,7 @@ LIMIT.NAME=\u5236\u9650
LONG_NAME=JSON\u30D5\u30A3\u30FC\u30EB\u30C9\u5185\u306E\u7279\u5B9A\u306E\u30AB\u30E9\u30E0\u304B\u3089\u8907\u6570\u306E\u30AB\u30E9\u30E0\u3092\u751F\u6210\u3057\u307E\u3059
LOOP_QUERY.NAME=\u30EB\u30FC\u30D7 XPath\u30AF\u30A8\u30EA\u30FC
MAPPING.ITEM.QUERY=XPath\u30AF\u30A8\u30EA\u30FC
MAPPING.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u306E\u53D6\u5F97
MAPPING.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u3092\u53D6\u5F97
MAPPING.ITEM.ISARRAY=Array
MAPPING.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0
NB_LINE.NAME=\u884C\u6570

View File

@@ -3,7 +3,7 @@ LIMIT.NAME=\u5236\u9650
LONG_NAME=tFileInputXML\u3068\u3057\u3066\u5165\u529B\u884C\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u89E3\u6790\u3057\u307E\u3059
LOOP_QUERY.NAME=\u30EB\u30FC\u30D7 XPath\u30AF\u30A8\u30EA\u30FC
MAPPING.ITEM.QUERY=XPath\u30AF\u30A8\u30EA\u30FC
MAPPING.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u306E\u53D6\u5F97
MAPPING.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u3092\u53D6\u5F97
MAPPING.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0
NB_LINE.NAME=\u884C\u6570
REJECT.LINK=\u30EA\u30B8\u30A7\u30AF\u30C8

View File

@@ -35,4 +35,4 @@ SECURITY_MODE.ITEM.IMPLICIT=\u6697\u9ED9\u7684
SECURITY_MODE.ITEM.EXPLICIT=\u660E\u793A\u7684
USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528

View File

@@ -50,4 +50,4 @@ PERL5_REGEX.NAME=Perl5\u6B63\u898F\u8868\u73FE\u5F0F\u3092\u30D5\u30A1\u30A4\u30
MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306B\u79FB\u52D5
USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528

View File

@@ -46,4 +46,4 @@ CONNECT_MODE.ITEM.PASSIVE=\u4E0D\u6D3B\u6027
IGNORE_FAILURE_AT_QUIT.NAME=\u7D42\u4E86\u6642\u306B\u30A8\u30E9\u30FC\u3092\u7121\u8996(FTP)
USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528

View File

@@ -47,4 +47,4 @@ FILES.ITEM.FILEMASK=\u30D5\u30A1\u30A4\u30EB\u30DE\u30B9\u30AF
MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306B\u79FB\u52D5
USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528

View File

@@ -44,4 +44,4 @@ MODE.ITEM.BINARY=\u30D0\u30A4\u30CA\u30EA
MODE.NAME=\u8EE2\u9001\u30E2\u30FC\u30C9
USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528

View File

@@ -62,4 +62,4 @@ PERL5_REGEX.NAME=Perl5\u6B63\u898F\u8868\u73FE\u5F0F\u3092\u30D5\u30A1\u30A4\u30
MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306B\u79FB\u52D5
USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528

View File

@@ -66,4 +66,4 @@ FTPSOVERWRITE.ITEM.ALWAYS=\u5E38\u306B
FTPSOVERWRITE.NAME=\u30D5\u30A1\u30A4\u30EB\u306E\u4E0A\u66F8\u304D
USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528

View File

@@ -51,4 +51,4 @@ IGNORE_FAILURE_AT_QUIT.NAME=\u7D42\u4E86\u6642\u306B\u30A8\u30E9\u30FC\u3092\u71
MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306B\u79FB\u52D5
USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528

View File

@@ -46,4 +46,4 @@ PERL5_REGEX.NAME=Perl5\u6B63\u898F\u8868\u73FE\u5F0F\u3092\u30D5\u30A1\u30A4\u30
MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306B\u79FB\u52D5
USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528

View File

@@ -1,4 +1,4 @@
CREATE_DIRECTORY.NAME=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u3001\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u3092\u4F5C\u6210
CREATE_DIRECTORY.NAME=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u304C\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u4F5C\u6210
DESTINATION.NAME=\u30C7\u30B9\u30C6\u30A3\u30CD\u30FC\u30B7\u30E7\u30F3\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC
FILENAME.NAME=\u30D5\u30A1\u30A4\u30EB\u540D
HELP=org.talend.help.tFileCopy

View File

@@ -13,7 +13,7 @@ USEURL.NAME=Url\u3092\u4F7F\u7528
URLPATH.NAME=URL
LOOP_QUERY.NAME=\u30EB\u30FC\u30D7 XPath\u30AF\u30A8\u30EA\u30FC
MAPPINGXPATH.ITEM.QUERY=XPath\u30AF\u30A8\u30EA\u30FC
MAPPINGXPATH.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u306E\u53D6\u5F97
MAPPINGXPATH.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u3092\u53D6\u5F97
MAPPINGXPATH.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0
REJECT.LINK=\u30EA\u30B8\u30A7\u30AF\u30C8
REJECT.MENU=\u30EA\u30B8\u30A7\u30AF\u30C8

View File

@@ -11,7 +11,7 @@ IGNORE_NS.NAME=\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u3092\u7121\u8996
LIMIT.NAME=\u5236\u9650
LONG_NAME=XML\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30D5\u30A3\u30FC\u30EB\u30C9\u3067\u5206\u5272\u3057\u305F\u884C\u3092\u62BD\u51FA\u3057\u307E\u3059\u3002
LOOP_QUERY.NAME=\u30EB\u30FC\u30D7 XPath\u30AF\u30A8\u30EA\u30FC
MAPPING.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u306E\u53D6\u5F97
MAPPING.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u3092\u53D6\u5F97
MAPPING.ITEM.QUERY=XPath\u30AF\u30A8\u30EA\u30FC
MAPPING.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0
NB_LINE.NAME=\u884C\u6570

View File

@@ -36,6 +36,7 @@ HIVE_SERVER.ITEM.HIVE2=Hive 2
CONNECTION_MODE.NAME=Mode de connexion
CONNECTION_MODE.ITEM.EMBEDDED=Embarqu\u00E9(e)
CONNECTION_MODE.ITEM.STANDALONE=Standalone
CONNECTION_MODE.ITEM.DATAPROC=Dataproc
HIVE_ADDITIONAL_JDBC.NAME=Param\u00E8tres JDBC suppl\u00E9mentaires
SET_MAPRED_JT.NAME=Configurer l'URI du JobTracker
SET_FS_DEFAULT_NAME.NAME=D\u00E9finir l'URI du NameNode

View File

@@ -36,6 +36,7 @@ HIVE_SERVER.ITEM.HIVE2=Hive 2
CONNECTION_MODE.NAME=\u63A5\u7D9A\u30E2\u30FC\u30C9
CONNECTION_MODE.ITEM.EMBEDDED=\u7D44\u307F\u8FBC\u307F
CONNECTION_MODE.ITEM.STANDALONE=\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3
CONNECTION_MODE.ITEM.DATAPROC=Dataproc
HIVE_ADDITIONAL_JDBC.NAME=JDBC\u8FFD\u52A0\u8A2D\u5B9A
SET_MAPRED_JT.NAME=\u30B8\u30E7\u30D6\u30C8\u30E9\u30C3\u30AB\u30FCURI\u3092\u8A2D\u5B9A
SET_FS_DEFAULT_NAME.NAME=\u30CD\u30FC\u30E0\u30CE\u30FC\u30C9URI\u3092\u8A2D\u5B9A

View File

@@ -36,6 +36,7 @@ HIVE_SERVER.ITEM.HIVE2=Hive 2
CONNECTION_MODE.NAME=\u8FDE\u63A5\u6A21\u5F0F
CONNECTION_MODE.ITEM.EMBEDDED=\u5D4C\u5165\u5F0F
CONNECTION_MODE.ITEM.STANDALONE=\u72EC\u7ACB
CONNECTION_MODE.ITEM.DATAPROC=Dataproc
HIVE_ADDITIONAL_JDBC.NAME=\u9644\u52A0 JDBC \u8BBE\u7F6E
SET_MAPRED_JT.NAME=\u8BBE\u7F6E Jobtracker URI
SET_FS_DEFAULT_NAME.NAME=\u8BBE\u7F6E Namenode URI

View File

@@ -35,18 +35,16 @@ imports="
String theDistribution = ElementParameterParser.getValue(node, "__DISTRIBUTION__");
String theVersion = ElementParameterParser.getValue(node, "__HIVE_VERSION__");
String connMode = ElementParameterParser.getValue(node, "__CONNECTION_MODE__");
if("true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"))) {
String connection = ElementParameterParser.getValue(node, "__CONNECTION__");
node.getProcess().getNodesOfType("tHiveConnection").stream()
.filter(pNode -> connection!=null && connection.equals(pNode.getUniqueName()) )
.findFirst()
.ifPresent(pNode -> {
theDistribution = ElementParameterParser.getValue(pNode, "__DISTRIBUTION__");
theVersion = ElementParameterParser.getValue(pNode, "__HIVE_VERSION__");
connMode = ElementParameterParser.getValue(pNode, "__CONNECTION_MODE__");
});
for (INode pNode : node.getProcess().getNodesOfType("tHiveConnection")) {
if(connection!=null && connection.equals(pNode.getUniqueName())) {
theDistribution = ElementParameterParser.getValue(pNode, "__DISTRIBUTION__");
theVersion = ElementParameterParser.getValue(pNode, "__HIVE_VERSION__");
connMode = ElementParameterParser.getValue(pNode, "__CONNECTION_MODE__");
}
}
}
org.talend.hadoop.distribution.component.HiveComponent hiveDistrib = null;

View File

@@ -18,18 +18,16 @@ imports="
String theDistribution = ElementParameterParser.getValue(node, "__DISTRIBUTION__");
String theVersion = ElementParameterParser.getValue(node, "__HIVE_VERSION__");
String connMode = ElementParameterParser.getValue(node, "__CONNECTION_MODE__");
if("true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"))) {
String connection = ElementParameterParser.getValue(node, "__CONNECTION__");
node.getProcess().getNodesOfType("tHiveConnection").stream()
.filter(pNode -> connection!=null && connection.equals(pNode.getUniqueName()) )
.findFirst()
.ifPresent(pNode -> {
theDistribution = ElementParameterParser.getValue(pNode, "__DISTRIBUTION__");
theVersion = ElementParameterParser.getValue(pNode, "__HIVE_VERSION__");
connMode = ElementParameterParser.getValue(pNode, "__CONNECTION_MODE__");
});
for (INode pNode : node.getProcess().getNodesOfType("tHiveConnection")) {
if(connection!=null && connection.equals(pNode.getUniqueName())) {
theDistribution = ElementParameterParser.getValue(pNode, "__DISTRIBUTION__");
theVersion = ElementParameterParser.getValue(pNode, "__HIVE_VERSION__");
connMode = ElementParameterParser.getValue(pNode, "__CONNECTION_MODE__");
}
}
}
org.talend.hadoop.distribution.component.HiveComponent hiveDistrib = null;

View File

@@ -36,19 +36,17 @@ String encryptedToken = null;
String theDistribution = ElementParameterParser.getValue(node, "__DISTRIBUTION__");
String theVersion = ElementParameterParser.getValue(node, "__HIVE_VERSION__");
String connMode = ElementParameterParser.getValue(node, "__CONNECTION_MODE__");
if("true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"))) {
String connection = ElementParameterParser.getValue(node, "__CONNECTION__");
node.getProcess().getNodesOfType("tHiveConnection").stream()
.filter(pNode -> connection!=null && connection.equals(pNode.getUniqueName()) )
.findFirst()
.ifPresent(pNode -> {
theDistribution = ElementParameterParser.getValue(pNode, "__DISTRIBUTION__");
theVersion = ElementParameterParser.getValue(pNode, "__HIVE_VERSION__");
connMode = ElementParameterParser.getValue(pNode, "__CONNECTION_MODE__");
});
if("true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"))) {
String connection = ElementParameterParser.getValue(node, "__CONNECTION__");
for (INode pNode : node.getProcess().getNodesOfType("tHiveConnection")) {
if(connection!=null && connection.equals(pNode.getUniqueName())) {
theDistribution = ElementParameterParser.getValue(pNode, "__DISTRIBUTION__");
theVersion = ElementParameterParser.getValue(pNode, "__HIVE_VERSION__");
connMode = ElementParameterParser.getValue(pNode, "__CONNECTION_MODE__");
}
}
}
org.talend.hadoop.distribution.component.HiveComponent hiveDistrib = null;
try {

View File

@@ -76,6 +76,7 @@ HIVE_SERVER.ITEM.HIVE2=Hive 2
CONNECTION_MODE.NAME=Mode de connexion
CONNECTION_MODE.ITEM.EMBEDDED=Embarqu\u00E9(e)
CONNECTION_MODE.ITEM.STANDALONE=Standalone
CONNECTION_MODE.ITEM.DATAPROC=Dataproc
SET_TEMP_PATH.NAME=Configurer un chemin temporaire
TEMP_PATH.NAME=
TEMP_PATH_GROUP.NAME=Chemin temporaire

View File

@@ -76,6 +76,7 @@ HIVE_SERVER.ITEM.HIVE2=Hive 2
CONNECTION_MODE.NAME=\u63A5\u7D9A\u30E2\u30FC\u30C9
CONNECTION_MODE.ITEM.EMBEDDED=\u7D44\u307F\u8FBC\u307F
CONNECTION_MODE.ITEM.STANDALONE=\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3
CONNECTION_MODE.ITEM.DATAPROC=Dataproc
SET_TEMP_PATH.NAME=\u4E00\u6642\u9818\u57DF\u30D1\u30B9\u3092\u8A2D\u5B9A
TEMP_PATH.NAME=
TEMP_PATH_GROUP.NAME=\u4E00\u6642\u9818\u57DF\u30D1\u30B9

View File

@@ -76,6 +76,7 @@ HIVE_SERVER.ITEM.HIVE2=Hive 2
CONNECTION_MODE.NAME=\u8FDE\u63A5\u6A21\u5F0F
CONNECTION_MODE.ITEM.EMBEDDED=\u5D4C\u5165\u5F0F
CONNECTION_MODE.ITEM.STANDALONE=\u72EC\u7ACB
CONNECTION_MODE.ITEM.DATAPROC=Dataproc
SET_TEMP_PATH.NAME=\u8BBE\u7F6E\u4E34\u65F6\u8DEF\u5F84
TEMP_PATH.NAME=
TEMP_PATH_GROUP.NAME=\u4E34\u65F6\u8DEF\u5F84

View File

@@ -427,7 +427,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -220,7 +220,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -295,7 +295,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -388,7 +388,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -352,7 +352,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -534,7 +534,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -274,7 +274,7 @@
<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22" REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -27565,7 +27565,7 @@
<!-- 2011 -->
<!-- crm client -->
<IMPORT NAME="talend-mscrm" MODULE="talend-mscrm-3.11-20220124.jar" MVN="mvn:org.talend.components/talend-mscrm/3.11-20220124" REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION =='API_2016_ODATA' OR API_VERSION =='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
<IMPORT NAME="talend-mscrm" MODULE="talend-mscrm-3.12-20220513.jar" MVN="mvn:org.talend.components/talend-mscrm/3.12-20220513" REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION =='API_2016_ODATA' OR API_VERSION =='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
<!-- axis2 1.8.0 -->
<IMPORT NAME="jakarta.activation-api-1.2.1" MODULE="jakarta.activation-api-1.2.1.jar" MVN="mvn:jakarta.activation/jakarta.activation-api/1.2.1" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
<IMPORT NAME="axiom-api-1.3.0" MODULE="axiom-api-1.3.0.jar" MVN="mvn:org.apache.ws.commons.axiom/axiom-api/1.3.0" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
@@ -27821,9 +27821,9 @@
MVN="mvn:org.talend.libraries/aalto-xml-0.9.10/6.4.0"
REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />
<IMPORT
NAME="adal4j-1.6.4-20211021"
MODULE="adal4j-1.6.4-20211021.jar"
MVN="mvn:com.microsoft.azure/adal4j/1.6.4-20211021"
NAME="msal4j-1.11.2"
MODULE="msal4j-1.11.2.jar"
MVN="mvn:com.microsoft.azure/msal4j/1.11.2"
REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />
<IMPORT
NAME="commons-codec-1.14"
@@ -27841,9 +27841,9 @@
MVN="mvn:org.apache.commons/commons-lang3/3.10"
REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />
<IMPORT
NAME="gson-2.8.6"
MODULE="gson-2.8.6.jar"
MVN="mvn:com.google.code.gson/gson/2.8.6"
NAME="gson-2.9.0"
MODULE="gson-2.9.0.jar"
MVN="mvn:com.google.code.gson/gson/2.9.0"
REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />
<IMPORT
NAME="commons-logging"
@@ -27893,8 +27893,8 @@
REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />
<IMPORT
NAME="nimbus-jose-jwt"
MODULE="nimbus-jose-jwt-8.11.jar"
MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"
MODULE="nimbus-jose-jwt-9.22.jar"
MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"
REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />
<IMPORT
NAME="oauth2-oidc-sdk"

View File

@@ -38325,7 +38325,7 @@
<!-- 2011 -->
<!-- crm client -->
<IMPORT NAME="talend-mscrm" MODULE="talend-mscrm-3.11-20220124.jar" MVN="mvn:org.talend.components/talend-mscrm/3.11-20220124" REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION =='API_2016_ODATA' OR API_VERSION =='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
<IMPORT NAME="talend-mscrm" MODULE="talend-mscrm-3.12-20220513.jar" MVN="mvn:org.talend.components/talend-mscrm/3.12-20220513" REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION =='API_2016_ODATA' OR API_VERSION =='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
<!-- axis2 1.8.0 -->
<IMPORT NAME="jakarta.activation-api-1.2.1" MODULE="jakarta.activation-api-1.2.1.jar" MVN="mvn:jakarta.activation/jakarta.activation-api/1.2.1" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
<IMPORT NAME="axiom-api-1.3.0" MODULE="axiom-api-1.3.0.jar" MVN="mvn:org.apache.ws.commons.axiom/axiom-api/1.3.0" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
@@ -38587,10 +38587,10 @@
MVN="mvn:org.talend.libraries/aalto-xml-0.9.10/6.4.0"
REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
<IMPORT
NAME="adal4j-1.6.4-20211021"
MODULE="adal4j-1.6.4-20211021.jar"
MVN="mvn:com.microsoft.azure/adal4j/1.6.4-20211021"
REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
NAME="msal4j-1.11.2"
MODULE="msal4j-1.11.2.jar"
MVN="mvn:com.microsoft.azure/msal4j/1.11.2"
REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />
<IMPORT
NAME="commons-codec-1.14.jar"
MODULE="commons-codec-1.14.jar"
@@ -38607,10 +38607,10 @@
MVN="mvn:org.apache.commons/commons-lang3/3.10"
REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
<IMPORT
NAME="gson"
MODULE="gson-2.8.6.jar"
MVN="mvn:com.google.code.gson/gson/2.8.6"
REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
NAME="gson-2.9.0"
MODULE="gson-2.9.0.jar"
MVN="mvn:com.google.code.gson/gson/2.9.0"
REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />
<IMPORT
NAME="commons-logging"
MODULE="commons-logging-1.2.jar"
@@ -38659,8 +38659,8 @@
REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
<IMPORT
NAME="nimbus-jose-jwt"
MODULE="nimbus-jose-jwt-8.11.jar"
MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"
MODULE="nimbus-jose-jwt-9.22.jar"
MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"
REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
<IMPORT
NAME="oauth2-oidc-sdk"

View File

@@ -216,7 +216,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Postgres_Driver"
MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>

View File

@@ -170,7 +170,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="DB_VERSION =='V9_X'" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="DB_VERSION =='V9_X'" />
<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="DB_VERSION =='PRIOR_TO_V9'" />
<IMPORT NAME="slf4j-api-1.7.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
<IMPORT NAME="slf4j-log4j12-1.7.29.jar" MODULE="slf4j-log4j12-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />

View File

@@ -249,7 +249,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -362,7 +362,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -296,7 +296,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -521,7 +521,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -366,7 +366,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -228,7 +228,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false') AND (DRIVER_IF_GREENPLUM == 'POSTGRESQL')" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false') AND (DRIVER_IF_GREENPLUM == 'POSTGRESQL')" />
<IMPORT NAME="Postgres_Driver"
MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="((DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false') AND (DRIVER_IF_GREENPLUM == 'POSTGRESQL'))" />
<IMPORT NAME="Greenplum-Driver" MODULE="greenplum-5.1.4.000275.jar" MVN="mvn:com.pivotal/greenplum/5.1.4.000275" REQUIRED_IF="(DRIVER_IF_GREENPLUM == 'GREENPLUM') AND (USE_EXISTING_CONNECTION == 'false')"/>

View File

@@ -202,7 +202,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="DB_VERSION =='V9_X'" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="DB_VERSION =='V9_X'" />
<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="DB_VERSION =='PRIOR_TO_V9'" />
<IMPORT NAME="slf4j-api-1.7.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
<IMPORT NAME="slf4j-log4j12-1.7.29.jar" MODULE="slf4j-log4j12-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.29" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />

View File

@@ -280,7 +280,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgis" MODULE="postgis_1.4.0.jar" MVN="mvn:org.talend.libraries/postgis_1.4.0/6.0.0" REQUIRED="false" />
<IMPORT NAME="org.talend.sdi" MODULE="org.talend.sdi.jar" MVN="mvn:org.talend.libraries/org.talend.sdi/6.0.0" REQUIRED="false" />

View File

@@ -441,7 +441,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgis" MODULE="postgis_1.4.0.jar" MVN="mvn:org.talend.libraries/postgis_1.4.0/6.0.0" REQUIRED="false" />
<IMPORT NAME="org.talend.sdi" MODULE="org.talend.sdi.jar" MVN="mvn:org.talend.libraries/org.talend.sdi/6.0.0" REQUIRED="false" />

View File

@@ -327,7 +327,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -521,7 +521,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -366,7 +366,7 @@
<CODEGENERATION>
<IMPORTS>
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
</IMPORTS>
</CODEGENERATION>

View File

@@ -33,7 +33,8 @@ skeleton="../templates/db_output_bulk.skeleton"
boolean useExistingS3Connection = "true".equalsIgnoreCase(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION_S3__"));
String s3ConnectionCid = ElementParameterParser.getValue(node,"__CONNECTION_S3__");
int driveVersion = "DRIVER_V2".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__"))? 2 : 1;
int driveVersion = ("DRIVER_V2".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__")) || "DRIVER_VERSION".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__")))
? 2 : 1;
boolean useStringProperties = "true".equals(ElementParameterParser.getValue(node, "__USE_STRING_PROPERTIES__"));
INode current_node = node;
@@ -113,7 +114,8 @@ skeleton="../templates/db_output_bulk.skeleton"
<%}%>
String dbUser_<%=cid %> = <%=userName%>;
String dbPwd_<%=cid %> = decryptedPass_<%=cid%>;
<%
<%
if(driveVersion == 2 && !useStringProperties){
log4jCodeGenerateUtil.connectWithProperties(node);
@@ -121,7 +123,7 @@ skeleton="../templates/db_output_bulk.skeleton"
log4jCodeGenerateUtil.connect(node);
}
}
String tableAction = ElementParameterParser.getValue(node,"__TABLE_ACTION__");
String dbmsId = ElementParameterParser.getValue(node,"__MAPPING__");
List<Column> stmtStructure = null;

View File

@@ -11,21 +11,21 @@ imports="
<%
class ConnectionUtil extends DefaultConnectionUtil{
int driveVersion;
Boolean useStringProperties ;
String logLevel;
public void createURL(INode node) {
super.createURL(node);
int driveVersion;
Boolean useStringProperties;
String logLevel;
String jdbcUrl;
public void createURL(INode node) {
super.createURL(node);
boolean useLogFile= "true".equals(ElementParameterParser.getValue(node, "__USE_LOG_FILE__"));
String logFile= ElementParameterParser.getValue(node, "__LOG_FILE__");
String jdbcUrl = ElementParameterParser.getValue(node, "__JDBC_URL__");
driveVersion = "DRIVER_V2".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__"))? 2 : 1;
String logFile= ElementParameterParser.getValue(node, "__LOG_FILE__");
jdbcUrl = ElementParameterParser.getValue(node, "__JDBC_URL__");
driveVersion = "DRIVER_V2".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__"))? 2 : 1;
useStringProperties = "true".equals(ElementParameterParser.getValue(node, "__USE_STRING_PROPERTIES__"));
logLevel= ElementParameterParser.getValue(node, "__LOG_LEVEL__");
if(!logLevel.equals("0")){
if (useLogFile) {
%>
@@ -78,7 +78,21 @@ imports="
java.util.Properties properties_<%=cid%> = new java.util.Properties();
properties_<%=cid%>.setProperty("user",dbUser_<%=cid%>);
properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
<%
if ("SSO".equals(jdbcUrl)){
%>
if (dbPwd_<%=cid%> != null) {
<%
}
%>
properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
<%
if ("SSO".equals(jdbcUrl)){
%>
}
<%
}
%>
<%
for(Map<String, String> entry : properties){
%>

View File

@@ -17,20 +17,21 @@ imports="
class DBInputBeginUtil extends DefaultDBInputUtil{
int driveVersion;
Boolean useStringProperties ;
String logLevel;
int driveVersion;
Boolean useStringProperties;
String logLevel;
String jdbcUrl;
public void setURL(INode node) {
boolean useLogFile= "true".equals(ElementParameterParser.getValue(node, "__USE_LOG_FILE__"));
String logLevel= ElementParameterParser.getValue(node, "__LOG_LEVEL__");
String logFile= ElementParameterParser.getValue(node, "__LOG_FILE__");
String jdbcUrl = ElementParameterParser.getValue(node, "__JDBC_URL__");
driveVersion = "DRIVER_V2".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__"))? 2 : 1;
public void setURL(INode node) {
boolean useLogFile= "true".equals(ElementParameterParser.getValue(node, "__USE_LOG_FILE__"));
String logLevel= ElementParameterParser.getValue(node, "__LOG_LEVEL__");
String logFile= ElementParameterParser.getValue(node, "__LOG_FILE__");
jdbcUrl= ElementParameterParser.getValue(node, "__JDBC_URL__");
driveVersion = "DRIVER_V2".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__"))? 2 : 1;
useStringProperties = "true".equals(ElementParameterParser.getValue(node, "__USE_STRING_PROPERTIES__"));
logLevel= ElementParameterParser.getValue(node, "__LOG_LEVEL__");
if(!logLevel.equals("0")){
if (useLogFile) {
%>
@@ -92,7 +93,21 @@ imports="
java.util.Properties properties_<%=cid%> = new java.util.Properties();
properties_<%=cid%>.setProperty("user",dbUser_<%=cid%>);
properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
<%
if ("SSO".equals(jdbcUrl)){
%>
if (dbPwd_<%=cid%> != null) {
<%
}
%>
properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
<%
if ("SSO".equals(jdbcUrl)){
%>
}
<%
}
%>
<%
for(Map<String, String> entry : properties){
%>

View File

@@ -241,7 +241,21 @@ if(("true").equals(useExistingConn)) {
java.util.Properties properties_<%=cid%> = new java.util.Properties();
properties_<%=cid%>.setProperty("user",dbUser_<%=cid%>);
properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
<%
if ("SSO".equals(jdbcUrl)){
%>
if (dbPwd_<%=cid%> != null) {
<%
}
%>
properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
<%
if ("SSO".equals(jdbcUrl)){
%>
}
<%
}
%>
<%
for(Map<String, String> entry : properties){
%>

View File

@@ -13,9 +13,10 @@ imports="
class DBRowBeginUtil extends DefaultDBRowUtil{
int driveVersion;
Boolean useStringProperties ;
String logLevel;
int driveVersion;
Boolean useStringProperties;
String logLevel;
String jdbcUrl;
public void beforeComponentProcess(INode node){
super.beforeComponentProcess(node);
@@ -23,8 +24,8 @@ imports="
}
public void setURL(INode node) {
String jdbcUrl = ElementParameterParser.getValue(node, "__JDBC_URL__");
driveVersion = "DRIVER_V2".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__"))? 2 : 1;
jdbcUrl = ElementParameterParser.getValue(node, "__JDBC_URL__");
driveVersion = "DRIVER_V2".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__"))? 2 : 1;
useStringProperties = "true".equals(ElementParameterParser.getValue(node, "__USE_STRING_PROPERTIES__"));
%>
@@ -60,7 +61,21 @@ imports="
%>
java.util.Properties properties_<%=cid%> = new java.util.Properties();
properties_<%=cid%>.setProperty("user",dbUser_<%=cid%>);
properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
<%
if ("SSO".equals(jdbcUrl)){
%>
if (dbPwd_<%=cid%> != null) {
<%
}
%>
properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
<%
if ("SSO".equals(jdbcUrl)){
%>
}
<%
}
%>
<%
for(Map<String, String> entry : properties){
%>

View File

@@ -61,4 +61,4 @@ ENCODING.ITEM.AL16UTF16=AL16UTF16
DB_VERSION.NAME=Version de la base de donn\u00E9es
DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures

View File

@@ -17,4 +17,4 @@ SCHEMA_DB.NAME=Sch\u00E9ma
DB_VERSION.NAME=Version de la base de donn\u00E9es
DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures

View File

@@ -48,7 +48,7 @@ DB_VERSION.NAME=Version de la base de donn\u00E9es
DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12
DB_VERSION.ITEM.SYBSEIQ_15=Sybase 15
DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures
DATA_SOURCE.NAME=Source de donn\u00E9es
DATA_SOURCE.ITEM.DATA_SOURCE_NAME=DSN
DATA_SOURCE.ITEM.FILE_DATA_SOURCE_NAME=FILEDSN

View File

@@ -55,7 +55,7 @@ DB_VERSION.NAME=Version de la base de donn\u00E9es
DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12
DB_VERSION.ITEM.SYBSEIQ_15=Sybase 15
DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures
DATA_SOURCE.NAME=Source de donn\u00E9es
DATA_SOURCE.ITEM.DATA_SOURCE_NAME=DSN
DATA_SOURCE.ITEM.FILE_DATA_SOURCE_NAME=FILEDSN

View File

@@ -40,7 +40,7 @@ PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
DB_VERSION.NAME=Version de la base de donn\u00E9es
DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures
SET_QUERY_TIMEOUT.NAME=Configurer le d\u00E9lai avant expiration de la requ\u00EAte
QUERY_TIMEOUT_IN_SECONDS.NAME=D\u00E9lai avant expiration (secondes)

View File

@@ -88,6 +88,6 @@ QUERY_TIMEOUT_IN_SECONDS.NAME=D\u00E9lai avant expiration (secondes)
DB_VERSION.NAME=Version de la base de donn\u00E9es
DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures
USE_ALTERNATE_SCHEMA.NAME=Utiliser un sch\u00E9ma alternatif
ALTERNATE_SCHEMA.NAME=Sch\u00E9ma

View File

@@ -62,4 +62,4 @@ SYBASE_ENCODING.ITEM.AL16UTF16=AL16UTF16
DB_VERSION.NAME=Version de la base de donn\u00E9es
DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures

View File

@@ -68,7 +68,7 @@ SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=Valeur du param\u00E8tre
DB_VERSION.NAME=Version de la base de donn\u00E9es
DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures
SET_QUERY_TIMEOUT.NAME=Configurer le d\u00E9lai avant expiration de la requ\u00EAte
QUERY_TIMEOUT_IN_SECONDS.NAME=D\u00E9lai avant expiration (secondes)

View File

@@ -91,4 +91,4 @@ REJECT.MENU=Rejects
DB_VERSION.NAME=Version de la base de donn\u00E9es
DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures

View File

@@ -84,4 +84,4 @@ FIELD_VALUE_INC_NULL.NAME=Les valeurs des champs source comprennent des nulles
DB_VERSION.NAME=Version de la base de donn\u00E9es
DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures

View File

@@ -31,4 +31,4 @@ DB_SCHEMA.NAME=Sch\u00E9ma Sybase
DB_VERSION.NAME=Version de la base de donn\u00E9es
DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures

View File

@@ -101,7 +101,10 @@ imports="
%>
java.util.Properties properties_<%=cid%> = new java.util.Properties();
properties_<%=cid%>.setProperty("user",dbUser_<%=cid%>);
properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
<% /* could connect using SSO without password, avoiding NPE here */ %>
if (dbPwd_<%=cid%> != null) {
properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
}
<%
for(java.util.Map<String, String> entry : properties){
%>

View File

@@ -29,7 +29,8 @@ public final class FileUtils {
File file = new File(filePath);
File parentFile = file.getParentFile();
if (!parentFile.isDirectory()) {
// msjian TDQ-19435: when filePath is "D:\\test", then parentFile is null
if (parentFile != null && !parentFile.isDirectory()) {
boolean createFolder = parentFile.mkdirs();
if (!createFolder) {
throw new RuntimeException("The following directory can't be created : '" //$NON-NLS-1$

View File

@@ -39,10 +39,9 @@ import org.talend.commons.ui.runtime.image.ImageProvider;
import org.talend.components.api.properties.ComponentProperties;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.ILibraryManagerService;
import org.talend.core.model.metadata.builder.connection.Connection;
import org.talend.core.model.metadata.builder.database.ExtractMetaDataUtils;
import org.talend.core.model.process.IElement;
import org.talend.core.model.process.IElementParameter;
import org.talend.core.model.properties.ConnectionItem;
import org.talend.core.runtime.util.GenericTypeUtils;
import org.talend.core.ui.CoreUIPlugin;
import org.talend.core.ui.properties.tab.IDynamicProperty;
@@ -53,9 +52,9 @@ import org.talend.designer.core.generic.constants.IGenericConstants;
import org.talend.designer.core.generic.i18n.Messages;
import org.talend.designer.core.generic.model.GenericElementParameter;
import org.talend.designer.core.generic.model.GenericTableUtils;
import org.talend.designer.core.generic.utils.ParameterUtilTool;
import org.talend.designer.core.ui.editor.cmd.PropertyChangeCommand;
import org.talend.designer.core.ui.editor.properties.controllers.AbstractElementPropertySectionController;
import org.talend.designer.core.ui.views.properties.composites.MissingSettingsMultiThreadDynamicComposite;
import org.talend.metadata.managment.ui.utils.ConnectionContextHelper;
/**
@@ -92,7 +91,6 @@ public class ButtonController extends AbstractElementPropertySectionController {
}
}
}
chooseContext();
Boolean result = loadJars(parameter);
if (result != null && !result) {
log.log(Priority.INFO, "JDBC Test connection install needed module is canceled", new Exception());
@@ -101,6 +99,8 @@ public class ButtonController extends AbstractElementPropertySectionController {
}
if (parameter != null) {
promptParameterMap.clear();
updatePromptParameter(parameter);
callBeforeActive(parameter);
// so as to invoke listeners to perform some actions.
return new PropertyChangeCommand(elem, parameter.getName(), null);
@@ -118,24 +118,8 @@ public class ButtonController extends AbstractElementPropertySectionController {
return false;
}
private void chooseContext(){
ConnectionItem connItem = null;
if(dynamicProperty instanceof MissingSettingsMultiThreadDynamicComposite){
connItem = ((MissingSettingsMultiThreadDynamicComposite)dynamicProperty).getConnectionItem();
}
if(connItem == null){
return;
}
Connection conn = connItem.getConnection();
if(!conn.isContextMode()){
return;
}
ConnectionContextHelper.context = ConnectionContextHelper.getContextTypeForContextMode(conn,
null, false);
}
private Boolean loadJars(IElementParameter parameter) {
ILibraryManagerService librairesManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault().getService(
ILibraryManagerService librairesManagerService = GlobalServiceRegister.getDefault().getService(
ILibraryManagerService.class);
if(librairesManagerService == null){
return null;
@@ -213,6 +197,7 @@ public class ButtonController extends AbstractElementPropertySectionController {
public void widgetSelected(SelectionEvent e) {
Command cmd = createCommand((Button) e.getSource());
executeCommand(cmd);
resetPromptParameter();
ConnectionContextHelper.context = null;
}
});
@@ -236,4 +221,9 @@ public class ButtonController extends AbstractElementPropertySectionController {
return 0;
}
@Override
protected List<? extends IElementParameter> getPromptParameters(IElement element) {
return ParameterUtilTool.getContextParameters(element);
}
}

View File

@@ -13,6 +13,7 @@
package org.talend.designer.core.generic.controller;
import java.beans.PropertyChangeEvent;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.eclipse.gef.commands.Command;
@@ -34,12 +35,13 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
import org.talend.commons.ui.runtime.image.ImageProvider;
import org.talend.core.model.process.IElement;
import org.talend.core.model.process.IElementParameter;
import org.talend.core.ui.CoreUIPlugin;
import org.talend.core.ui.properties.tab.IDynamicProperty;
import org.talend.core.utils.TalendQuoteUtils;
import org.talend.designer.core.generic.model.GenericElementParameter;
import org.talend.designer.core.generic.utils.ComponentsUtils;
import org.talend.designer.core.generic.utils.ParameterUtilTool;
import org.talend.designer.core.i18n.Messages;
import org.talend.designer.core.ui.editor.cmd.PropertyChangeCommand;
import org.talend.designer.core.ui.editor.nodes.Node;
@@ -70,6 +72,8 @@ public class NameAndLabelsReferenceController extends AbstractElementPropertySec
if (paramObj instanceof GenericElementParameter) {
GenericElementParameter gParam = (GenericElementParameter) paramObj;
if (gParam != null) {
promptParameterMap.clear();
updatePromptParameter(gParam);
callBeforeActive(gParam);
NameAndLabelsDialog nameAndLabelsDialog = new NameAndLabelsDialog(composite.getShell(),
ComponentsUtils.getFormalPossibleValues(gParam), this.isInWizard());
@@ -124,6 +128,7 @@ public class NameAndLabelsReferenceController extends AbstractElementPropertySec
public void widgetSelected(SelectionEvent e) {
Command cmd = createCommand((Button) e.getSource());
executeCommand(cmd);
resetPromptParameter();
}
});
@@ -216,4 +221,8 @@ public class NameAndLabelsReferenceController extends AbstractElementPropertySec
fixedCursorPosition(param, labelText, value, valueChanged);
}
@Override
protected List<? extends IElementParameter> getPromptParameters(IElement element) {
return ParameterUtilTool.getContextParameters(element);
}
}

View File

@@ -12,9 +12,14 @@
// ============================================================================
package org.talend.designer.core.generic.utils;
import java.util.ArrayList;
import java.util.List;
import org.talend.core.model.process.EParameterFieldType;
import org.talend.core.model.process.IElement;
import org.talend.core.model.process.IElementParameter;
import org.talend.designer.core.generic.model.GenericElementParameter;
import org.talend.designer.core.model.components.ElementParameter;
import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
import org.talend.designer.core.model.utils.emf.talendfile.TalendFileFactory;
@@ -116,4 +121,24 @@ public final class ParameterUtilTool {
}
return paramValue;
}
public static List<IElementParameter> getContextParameters(IElement element) {
List<IElementParameter> contextParameters = new ArrayList<>();
for (IElementParameter parameter : element.getElementParameters()) {
if (parameter instanceof GenericElementParameter) {
GenericElementParameter genericElementParameter = (GenericElementParameter) parameter;
if (genericElementParameter.isSupportContext()) {
contextParameters.add(parameter);
}
List<ElementParameter> relatedParameters = ComponentsUtils.getRelatedParameters(genericElementParameter);
for (ElementParameter relatedParameter : relatedParameters) {
if (relatedParameter instanceof GenericElementParameter
&& ((GenericElementParameter) relatedParameter).isSupportContext()) {
contextParameters.add(relatedParameter);
}
}
}
}
return contextParameters;
}
}

View File

@@ -75,7 +75,6 @@ import org.talend.core.ui.context.view.Contexts;
import org.talend.core.utils.CsvArray;
import org.talend.designer.core.convert.IProcessConvertService;
import org.talend.designer.core.convert.ProcessConvertManager;
import org.talend.designer.core.convert.ProcessConverterType;
import org.talend.designer.core.debug.JobLaunchShortcutManager;
import org.talend.designer.core.i18n.Messages;
import org.talend.designer.core.model.components.DummyComponent;
@@ -105,6 +104,7 @@ import org.talend.designer.core.ui.views.problems.Problems;
import org.talend.designer.core.ui.views.properties.ComponentSettings;
import org.talend.designer.core.ui.views.properties.ComponentSettingsView;
import org.talend.designer.core.utils.BigDataJobUtil;
import org.talend.designer.core.utils.ComponentsHelpUtil;
import org.talend.designer.core.utils.JavaProcessUtil;
import org.talend.designer.core.utils.UnifiedComponentUtil;
import org.talend.designer.runprocess.ProcessorException;
@@ -904,6 +904,11 @@ public class DesignerCoreService implements IDesignerCoreService {
return UpdateLog4jJarUtils.NEED_REMOVE_MODULES;
}
@Override
public void openComponentOnlineHelp(String componentName) {
ComponentsHelpUtil.openLineHelp(componentName);
}
@Override
public IProcess getJobletProcessByItem(Item item) {

View File

@@ -1806,7 +1806,7 @@ public class EmfComponent extends AbstractBasicComponent {
newParam.setRepositoryValue(componentType.getVersionRepositoryValueParameter());
for (DistributionBean b : hadoopDistributions) {
IElementParameterDefaultValue defaultType = new ElementParameterDefaultValue();
final DistributionVersion defaultVersion = "SPARK".equals(b.name) ? b.getVersion("SPARK_3_1_x", false) : b.getDefaultVersion();
final DistributionVersion defaultVersion = b.getDefaultVersion();
if (defaultVersion == null || defaultVersion.version == null || defaultVersion.version.isEmpty()) {
defaultType.setDefaultValue(defaultValue);
} else {

View File

@@ -89,6 +89,7 @@ import org.talend.core.model.metadata.builder.ConvertionHelper;
import org.talend.core.model.metadata.builder.connection.Connection;
import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
import org.talend.core.model.metadata.builder.database.ExtractMetaDataUtils;
import org.talend.core.model.metadata.builder.database.JavaSqlFactory;
import org.talend.core.model.metadata.designerproperties.EParameterNameForComponent;
import org.talend.core.model.param.EConnectionParameterName;
import org.talend.core.model.process.EComponentCategory;
@@ -97,6 +98,7 @@ import org.talend.core.model.process.Element;
import org.talend.core.model.process.IConnection;
import org.talend.core.model.process.IContext;
import org.talend.core.model.process.IContextManager;
import org.talend.core.model.process.IContextParameter;
import org.talend.core.model.process.IElement;
import org.talend.core.model.process.IElementParameter;
import org.talend.core.model.process.INode;
@@ -149,11 +151,14 @@ import org.talend.designer.core.ui.views.problems.Problems;
import org.talend.designer.core.ui.views.properties.ComponentSettingsView;
import org.talend.designer.core.ui.views.properties.MultipleThreadDynamicComposite;
import org.talend.designer.core.ui.views.properties.WidgetFactory;
import org.talend.designer.core.ui.views.properties.composites.MissingSettingsMultiThreadDynamicComposite;
import org.talend.designer.core.utils.UpgradeParameterHelper;
import org.talend.designer.runprocess.IRunProcessService;
import org.talend.hadoop.distribution.constants.HiveConstant;
import org.talend.hadoop.distribution.constants.ImpalaConstant;
import org.talend.metadata.managment.repository.ManagerConnection;
import org.talend.metadata.managment.ui.utils.ConnectionContextHelper;
import org.talend.metadata.managment.utils.MetadataConnectionUtils;
import org.talend.repository.RepositoryPlugin;
import org.talend.repository.model.IMetadataService;
import org.talend.repository.model.IProxyRepositoryFactory;
@@ -222,6 +227,8 @@ public abstract class AbstractElementPropertySectionController implements Proper
public static Map<String, String> connKeyMap = new HashMap<String, String>(10);
protected Map<String, String> promptParameterMap = new HashMap<String, String>();
static {
connKeyMap.put("SERVER_NAME", "HOST"); //$NON-NLS-1$ //$NON-NLS-2$
connKeyMap.put("PORT", "PORT"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -1714,20 +1721,22 @@ public abstract class AbstractElementPropertySectionController implements Proper
dbName = dbName.replace("\\\"", "");
}
dbName = TextUtil.removeQuots(dbName);
} else if (EDatabaseTypeName.GENERAL_JDBC.getDisplayName().equals(connParameters.getDbType())) {
} else if (EDatabaseTypeName.GENERAL_JDBC.getDisplayName().equals(dbType)) {
dbName = ""; //$NON-NLS-1$
}
boolean isJDBCImplicitContext = EDatabaseTypeName.GENERAL_JDBC.getDisplayName().equals(dbType)
&& elem instanceof ImplicitContextLoadElement;
connParameters.setDbName(dbName);
if ((elem instanceof Node) && (((Node)elem).getComponent().getComponentType().equals(EComponentType.GENERIC)
|| (element instanceof INode
if ((elem instanceof Node)
&& (((Node) elem).getComponent().getComponentType().equals(EComponentType.GENERIC) || (element instanceof INode
&& ((INode) element).getComponent().getComponentType().equals(EComponentType.GENERIC)))) {
connParameters.setUserName(getParameterValueWithContext(element, EConnectionParameterName.GENERIC_USERNAME.getDisplayName(), context,
basePropertyParameter));
connParameters.setPassword(getParameterValueWithContext(element, EConnectionParameterName.GENERIC_PASSWORD.getDisplayName(), context,
basePropertyParameter));
String url = TalendTextUtils.removeQuotesIfExist(getParameterValueWithContext(element, EConnectionParameterName.GENERIC_URL.getDisplayName(), context,
basePropertyParameter));
connParameters.setUserName(getParameterValueWithContext(element,
EConnectionParameterName.GENERIC_USERNAME.getDisplayName(), context, basePropertyParameter));
connParameters.setPassword(getParameterValueWithContext(element,
EConnectionParameterName.GENERIC_PASSWORD.getDisplayName(), context, basePropertyParameter));
String url = TalendTextUtils.removeQuotesIfExist(getParameterValueWithContext(element,
EConnectionParameterName.GENERIC_URL.getDisplayName(), context, basePropertyParameter));
connParameters.setUrl(url);
String jar = TalendTextUtils.removeQuotesIfExist(getParameterValueWithContext(element, EConnectionParameterName.GENERIC_DRIVER_JAR.getDisplayName(), context,
basePropertyParameter));
@@ -1755,18 +1764,30 @@ public abstract class AbstractElementPropertySectionController implements Proper
if (EDatabaseTypeName.ORACLE_CUSTOM.getDisplayName().equals(dbType)) {
url = TalendTextUtils.removeQuotesIfExist(getParameterValueWithContext(element, "RAC_"
+ EConnectionParameterName.URL.getName(), context, basePropertyParameter));
} else if (isJDBCImplicitContext) {
url = TalendTextUtils.removeQuotesIfExist(getParameterValueWithContext(element,
EConnectionParameterName.GENERIC_URL.getDisplayName(), context, basePropertyParameter));
}
}
connParameters.setUrl(url);
String driverClass = TalendTextUtils.removeQuotesIfExist(getParameterValueWithContext(element,
EConnectionParameterName.DRIVER_CLASS.getName(), context, basePropertyParameter));
String jar = TalendTextUtils.removeQuotesIfExist(getParameterValueWithContext(element,
EConnectionParameterName.DRIVER_JAR.getName(), context, basePropertyParameter));
if (EDatabaseTypeName.GENERAL_JDBC.getDisplayName().equals(dbType)) {
if (StringUtils.isEmpty(driverClass)) {
driverClass = TalendTextUtils.removeQuotesIfExist(getParameterValueWithContext(element,
EConnectionParameterName.GENERIC_DRIVER_CLASS.getDisplayName(), context, basePropertyParameter));
}
connParameters.setDriverClass(driverClass);// tJDBCSCDELT
if (StringUtils.isEmpty(jar)) {
jar = TalendTextUtils.removeQuotesIfExist(getParameterValueWithContext(element,
EConnectionParameterName.GENERIC_DRIVER_JAR.getDisplayName(), context, basePropertyParameter));
}
} else {
connParameters.setDriverClass(EDatabase4DriverClassName.getDriverClassByDbType(dbType));
}
connParameters.setDriverJar(TalendTextUtils.removeQuotesIfExist(getParameterValueWithContext(element,
EConnectionParameterName.DRIVER_JAR.getName(), context, basePropertyParameter)));
connParameters.setDriverJar(jar);
}
connParameters.setPort(getParameterValueWithContext(element, EConnectionParameterName.PORT.getName(), context,
@@ -2780,4 +2801,85 @@ public abstract class AbstractElementPropertySectionController implements Proper
return !(elem instanceof FakeElement) && param.isRepositoryValueUsed();
}
protected void updatePromptParameter(IElementParameter parameter) {
IElement element = parameter.getElement();
if (isInWizard()) {
ConnectionItem connItem = null;
if (dynamicProperty instanceof MissingSettingsMultiThreadDynamicComposite) {
connItem = ((MissingSettingsMultiThreadDynamicComposite) dynamicProperty).getConnectionItem();
}
if (connItem == null) {
return;
}
Connection conn = connItem.getConnection();
if (!conn.isContextMode()) {
return;
}
JavaSqlFactory.clearPromptContextCache();
Connection connection = MetadataConnectionUtils.prepareConection(conn);
if (connection == null) {
return;
}
ConnectionContextHelper.context = ConnectionContextHelper.getContextTypeForContextMode(connection,
connection.getContextName(), false);
List<? extends IElementParameter> params = getPromptParameters(element);
for (IElementParameter param : params) {
Object paramValue = param.getValue();
if (paramValue != null && !"".equals(paramValue)) { //$NON-NLS-1$
String value = JavaSqlFactory.getReportPromptConValueFromCache(connection.getContextName(),
connection.getContextId(), paramValue.toString());
if (StringUtils.isNotBlank(value)) {
promptParameterMap.put(param.getName(), paramValue.toString());
elem.setPropertyValue(param.getName(), value);
}
}
}
} else {
IContext selectContext = null;
if (part != null && part.getProcess() != null) {
selectContext = part.getProcess().getContextManager().getDefaultContext();
}
if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class) && part != null) {
IRunProcessService service = GlobalServiceRegister.getDefault().getService(IRunProcessService.class);
Shell shell = PlatformUI.getWorkbench().getDisplay().getActiveShell();
selectContext = service.promptConfirmLauch(shell, part.getProcess());
if (selectContext == null) {
return;
}
Map<String, String> promptNeededMap = new HashMap<String, String>();
for (IContextParameter contextParameter : selectContext.getContextParameterList()) {
if (contextParameter.isPromptNeeded()) {
String name = contextParameter.getName();
String value = contextParameter.getValue();
if (StringUtils.isNotBlank(value)) {
promptNeededMap.put("context." + name, value);//$NON-NLS-1$
}
}
}
List<? extends IElementParameter> params = getPromptParameters(element);
for (IElementParameter param : params) {
Object paramValue = param.getValue();
if (paramValue != null && !"".equals(paramValue)) { //$NON-NLS-1$
if (promptNeededMap.containsKey(paramValue)) {
promptParameterMap.put(param.getName(), paramValue.toString());
elem.setPropertyValue(param.getName(), promptNeededMap.get(paramValue));
}
}
}
}
}
}
protected void resetPromptParameter() {
Iterator<String> iter = promptParameterMap.keySet().iterator();
while (iter.hasNext()) {
String key = iter.next();
String value = promptParameterMap.get(key);
elem.setPropertyValue(key, value);
}
}
protected List<? extends IElementParameter> getPromptParameters(IElement element) {
return element.getElementParameters();
}
}

View File

@@ -344,14 +344,15 @@ public class DbTableController extends AbstractElementPropertySectionController
List<IContext> iContexts = new ArrayList<IContext>();
for (ContextType contextType : (List<ContextType>) contextItem.getContext()) {
IContext context = ContextUtils.convert2IContext(contextType, contextItem.getProperty().getId());
if (contextType.getName().equals(connection.getContextName())) {
if (contextType.getName().equals(contextItem.getDefaultContext())) {
defaultContext = context;
}
iContexts.add(context);
}
if (iContexts.size() > 0) {
selectContext = ConnectionContextHelper
.promptConfirmLauch(PlatformUI.getWorkbench().getDisplay().getActiveShell(), iContexts);
.promptConfirmLauch(PlatformUI.getWorkbench().getDisplay().getActiveShell(), iContexts,
defaultContext);
if (selectContext == null) {
if (ConnectionContextHelper.isPromptNeeded(iContexts)) {
button.setEnabled(true);
@@ -623,7 +624,11 @@ public class DbTableController extends AbstractElementPropertySectionController
@Override
public void run() {
IMetadataConnection convert = ConvertionHelper.convert(con, false, connParameters.getSelectContext());
String selectContext = connParameters.getSelectContext();
if (contextManager != null && contextManager instanceof EmptyContextManager && con.isContextMode()) {
selectContext = con.getContextName();
}
IMetadataConnection convert = ConvertionHelper.convert(con, false, selectContext);
iMetadata[0] = convert;
}
});

View File

@@ -136,7 +136,7 @@ public class StatsAndLogsConstants {
public static final String[] DB_VERSION_DISPLAY = new String[] { "Oracle 18 and above", "Oracle 12", "Oracle 11", "Oracle 10",
"Oracle 9", "Oracle 8", "MySQL 8", "MySQL 5", "MariaDB", "Open source JTDS", "Microsoft", "Access 2003",
"Access 2007", "Prior to v9", "v9 +", "Sybase 16 (SQL Anywhere)", "Sybase 16", "Sybase 12/15" };
"Access 2007", "Prior to v9", "v9 +", "Sybase 16 (SQL Anywhere) and above", "Sybase 16", "Sybase 12/15" };
public static final String[] DB_VERSION_CODE = new String[] {"ORACLE_18", "ORACLE_12", "ORACLE_11", "ORACLE_10", "ORACLE_9", "ORACLE_8",
@@ -164,7 +164,8 @@ public class StatsAndLogsConstants {
public static final String[] PSQL_VERSION_DISPLAY = new String[] {"v9 and later","Prior to v9" }; //$NON-NLS-1$ //$NON-NLS-2$
public static final String[] SYBASE_VERSION_DISPLAY = new String[] {"Sybase 16 (SQL Anywhere)", "Sybase 16", "Sybase 12/15" }; //$NON-NLS-1$ //$NON-NLS-2$
public static final String[] SYBASE_VERSION_DISPLAY = new String[] { "Sybase 16 (SQL Anywhere) and above", //$NON-NLS-1$
"Sybase 16", "Sybase 12/15" }; //$NON-NLS-1$
public static final String[] SYBASE_VERSION_CODE = new String[] {"SYBSEIQ_16_SA", "SYBSEIQ_16", "SYBSEIQ_12_15" };
public static final String[] PSQL_VERSION_CODE = new String[] { "V9_X","PRIOR_TO_V9" }; //$NON-NLS-1$ //$NON-NLS-2$

View File

@@ -175,6 +175,7 @@ public class ComponentSettingsView extends ViewPart implements IComponentSetting
public void createPartControl(Composite parent) {
this.parent = parent;
tabFactory.initComposite(parent, true);
tabFactory.getTabbedPropertyTitle().setIsComponentTitle(true);
tabFactory.addSelectionChangedListener(new ISelectionChangedListener() {
@Override
@@ -425,6 +426,7 @@ public class ComponentSettingsView extends ViewPart implements IComponentSetting
public void cleanDisplay() {
tabFactory.setInput(null);
tabFactory.setTitle(null, null);
tabFactory.getTabbedPropertyTitle().setComponentName(null);
tabFactory.getTabbedPropertyComposite().setCompactViewVisible(false);
if (tabFactory.getTabComposite() != null) {
for (Control curControl : tabFactory.getTabComposite().getChildren()) {
@@ -565,6 +567,7 @@ public class ComponentSettingsView extends ViewPart implements IComponentSetting
}
}
image = CoreImageProvider.getComponentIcon(node.getComponent(), ICON_SIZE.ICON_24);
tabFactory.getTabbedPropertyTitle().setComponentName(node.getComponent().getDisplayName());
} else if (elem instanceof Connection) {
label = ((Connection) elem).getElementName();
image = ImageProvider.getImage(EImage.RIGHT_ICON);

View File

@@ -1248,9 +1248,14 @@ public class HTMLDocGenerator implements IDocumentationGenerator {
jobVersion = version[0];
}
if (isRouteProcess(item)) {
projectElement.addAttribute("docType", "Route");//$NON-NLS-1$//$NON-NLS-2$
jobElement.addAttribute("type", "route");//$NON-NLS-1$//$NON-NLS-2$
ICamelDesignerCoreService camelService = GlobalServiceRegister.getDefault().getService(
ICamelDesignerCoreService.class);
if (isRouteLetProcess(item)) {
projectElement.addAttribute("docType", "Routelets");//$NON-NLS-1$//$NON-NLS-2$
jobElement.addAttribute("type", "routelets");//$NON-NLS-1$//$NON-NLS-2$
}
ICamelDesignerCoreService camelService = GlobalServiceRegister.getDefault()
.getService(ICamelDesignerCoreService.class);
camelService.appendRouteInfo2Doc(item, jobElement);
}
if (generateExtraSetting) {
@@ -1335,6 +1340,16 @@ public class HTMLDocGenerator implements IDocumentationGenerator {
return false;
}
protected boolean isRouteLetProcess(Item item) {
if (GlobalServiceRegister.getDefault().isServiceRegistered(ICamelDesignerCoreService.class)) {
ICamelDesignerCoreService camelService = GlobalServiceRegister.getDefault()
.getService(ICamelDesignerCoreService.class);
return camelService.isRouteletProcess(item);
}
return false;
}
/**
* Generates project element information in XML file.
*

View File

@@ -9,7 +9,8 @@ public enum EParamKind {
FORM("form"),
HEADER("header"),
MATRIX("matrix"),
MULTIPART("multipart")
MULTIPART("multipart"),
BODY("body")
;

View File

@@ -1,5 +1,7 @@
package org.talend.designer.oas.external;
import javax.swing.text.Document;
/**
* MediaTypes *\/* application/xml text/xml application/json
*/
@@ -20,7 +22,7 @@ public enum EParamType {
STRING("String", String.class),
// LIST("List"),
// DYNAMIC("Dynamic"),
// DOCUMENT("Document")
DOCUMENT("Document", Document.class)
;
private String label;

View File

@@ -72,11 +72,10 @@ import org.talend.daikon.properties.Properties;
import org.talend.daikon.properties.PropertiesImpl;
import org.talend.daikon.properties.presentation.Form;
import org.talend.designer.core.generic.constants.IGenericConstants;
import org.talend.designer.core.generic.model.GenericElementParameter;
import org.talend.designer.core.generic.model.GenericTableUtils;
import org.talend.designer.core.generic.utils.ComponentsUtils;
import org.talend.designer.core.generic.utils.ParameterUtilTool;
import org.talend.designer.core.model.FakeElement;
import org.talend.designer.core.model.components.ElementParameter;
import org.talend.designer.core.utils.UnifiedComponentUtil;
import org.talend.metadata.managment.utils.MetadataConnectionUtils;
import org.talend.repository.generic.persistence.GenericRepository;
@@ -173,7 +172,7 @@ public class GenericDBService implements IGenericDBService{
contextParentComp.setLayout(new GridLayout());
GenericContextHandler contextHandler = new GenericContextHandler();
contextHandler.setParameters(getContextParameters(baseElement));
contextHandler.setParameters(ParameterUtilTool.getContextParameters(baseElement));
ContextComposite contextComp = new ContextComposite(contextParentComp, (ConnectionItem)property.getItem(), isReadOnly,
contextHandler);
@@ -204,26 +203,6 @@ public class GenericDBService implements IGenericDBService{
}
}
private List<IElementParameter> getContextParameters(Element element) {
List<IElementParameter> contextParameters = new ArrayList<>();
for (IElementParameter parameter : element.getElementParameters()) {
if (parameter instanceof GenericElementParameter) {
GenericElementParameter genericElementParameter = (GenericElementParameter) parameter;
if (genericElementParameter.isSupportContext()) {
contextParameters.add(parameter);
}
List<ElementParameter> relatedParameters = ComponentsUtils.getRelatedParameters(genericElementParameter);
for (ElementParameter relatedParameter : relatedParameters) {
if (relatedParameter instanceof GenericElementParameter
&& ((GenericElementParameter) relatedParameter).isSupportContext()) {
contextParameters.add(relatedParameter);
}
}
}
}
return contextParameters;
}
private FormData createMainFormData(boolean addContextSupport) {
FormData data = new FormData();
data.left = new FormAttachment(0, 0);
@@ -320,7 +299,7 @@ public class GenericDBService implements IGenericDBService{
if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQRepositoryService.class)) {
tdqRepService =
(ITDQRepositoryService) GlobalServiceRegister.getDefault().getService(ITDQRepositoryService.class);
GlobalServiceRegister.getDefault().getService(ITDQRepositoryService.class);
}
if (tdqRepService != null) {
// MOD qiongli 2012-11-19 TDQ-6287

View File

@@ -73,6 +73,7 @@ import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.navigator.IExtensionStateModel;
import org.eclipse.ui.navigator.INavigatorContentService;
import org.talend.commons.CommonsPlugin;
import org.talend.commons.runtime.service.ITaCoKitService;
import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
import org.talend.commons.utils.system.EnvironmentUtils;
import org.talend.commons.utils.time.TimeMeasure;
@@ -97,6 +98,7 @@ import org.talend.core.model.repository.RepositoryObject;
import org.talend.core.repository.constants.FileConstants;
import org.talend.core.repository.model.ProjectRepositoryNode;
import org.talend.core.repository.model.repositoryObject.MetadataColumnRepositoryObject;
import org.talend.core.repository.seeker.RepositorySeekerManager;
import org.talend.core.ui.ITestContainerProviderService;
import org.talend.core.ui.advanced.composite.FilteredCheckboxTree;
import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
@@ -528,8 +530,14 @@ public class ExportItemWizardPage extends WizardPage {
}
}
if (objectType != null) {
ITaCoKitService coKitService = ITaCoKitService.getInstance();
boolean isTaCoKitType = false;
if (coKitService != null && coKitService.isTaCoKitType(objectType)) {
isTaCoKitType = true;
}
CheckboxTreeViewer exportItemsTreeViewer = getItemsTreeViewer();
if (objectType == ERepositoryObjectType.METADATA || objectType == ERepositoryObjectType.ROUTINES
if (isTaCoKitType || objectType == ERepositoryObjectType.METADATA
|| objectType == ERepositoryObjectType.ROUTINES
|| objectType == ERepositoryObjectType.DOCUMENTATION) {
RepositoryNode rootRepositoryNode = ProjectRepositoryNode.getInstance().getRootRepositoryNode(objectType);
if (rootRepositoryNode != null) {
@@ -1199,6 +1207,29 @@ public class ExportItemWizardPage extends WizardPage {
if (monitor.isCanceled()) {setCanceled(true); return;}
monitor.setTaskName("Caculating dependencies:" + (repositoryObject == null ? "" : repositoryObject.getLabel()));
RepositoryNode repositoryNode = RepositoryNodeUtilities.getRepositoryNode(repositoryObject, monitor);
if (repositoryNode == null) {
ERepositoryObjectType repositoryObjectType = repositoryObject.getRepositoryObjectType();
if (repositoryObjectType != null) {
ITaCoKitService coKitService = ITaCoKitService.getInstance();
if (coKitService != null) {
boolean taCoKitType = coKitService.isTaCoKitType(repositoryObjectType);
if (taCoKitType) {
repositoryNode = (RepositoryNode) RepositorySeekerManager.getInstance()
.searchRepoViewNode(repositoryObject.getProperty().getId(), false);
}
}
}
}
if (repositoryNode != null) {
checkedDependency.add(repositoryNode);
} else {
@@ -1584,7 +1615,7 @@ public class ExportItemWizardPage extends WizardPage {
private List<Object> getUnTestCaseChildren(Object[] children) {
ITestContainerProviderService testContainerService = null;
if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
testContainerService = (ITestContainerProviderService) GlobalServiceRegister.getDefault().getService(
testContainerService = GlobalServiceRegister.getDefault().getService(
ITestContainerProviderService.class);
}
List<Object> childrenNodes = new ArrayList<Object>();

View File

@@ -293,7 +293,7 @@ public class UpdatesitePreferencePage extends PreferencePage {
}
} else {
fd.height = 0;
if (isCloudConnection && isWorkbenchRunning) {
if (isWorkbenchRunning) {
FormData owFd = (FormData) overwritePanel.getLayoutData();
owFd.height = 0;
}

View File

@@ -13,6 +13,7 @@
package org.talend.repository.ui.wizards.exportjob.handler;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.util.ArrayList;
@@ -70,6 +71,7 @@ import org.talend.designer.maven.tools.BuildCacheManager;
import org.talend.designer.runprocess.IProcessor;
import org.talend.designer.runprocess.ProcessorUtilities;
import org.talend.model.bridge.ReponsitoryContextBridge;
import org.talend.repository.ProjectManager;
import org.talend.repository.documentation.ExportFileResource;
import org.talend.repository.local.ExportItemUtil;
import org.talend.repository.model.IProxyRepositoryFactory;
@@ -88,7 +90,6 @@ public class BuildJobHandler extends AbstractBuildJobHandler {
public BuildJobHandler(ProcessItem processItem, String version, String contextName, Map<ExportChoice, Object> exportChoiceMap) {
super(processItem, version, contextName, exportChoiceMap);
setProjectNameLowerCase(false);
ProcessorUtilities.setExportConfig(JavaUtils.JAVA_APP_NAME, null, null);
}
@@ -379,60 +380,70 @@ public class BuildJobHandler extends AbstractBuildJobHandler {
if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQItemService.class)) {
ITDQItemService tdqItemService = GlobalServiceRegister.getDefault().getService(
ITDQItemService.class);
List<Project> initProList = new ArrayList<>();
for (Item item : items) {
if (tdqItemService != null && tdqItemService.hasProcessItemDependencies(Arrays.asList(new Item[] { item }))) {
setNeedItemDependencies(true);
// add .Talend.definition file
String defIdxFolderName = "TDQ_Libraries"; //$NON-NLS-1$
String defIdxFileName = ".Talend.definition"; //$NON-NLS-1$
Project pro = getProject(processItem);
IFolder itemsProjectFolder = parentFolder.getFolder(pro.getTechnicalLabel().toLowerCase());
File itemsFolderDir = new File(parentFolder.getLocation().toFile().getAbsolutePath());
IProject project = ReponsitoryContextBridge.getRootProject();
String defIdxRelativePath = defIdxFolderName + PATH_SEPARATOR + defIdxFileName;
IFile defIdxFile = project.getFile(defIdxRelativePath);
if (defIdxFile.exists()) {
File defIdxFileSource = new File(project.getLocation().makeAbsolute().append(defIdxFolderName)
.append(defIdxFileName).toFile().toURI());
File defIdxFileTarget = new File(itemsProjectFolder.getFile(defIdxRelativePath).getLocation().toFile()
.getAbsolutePath());
FilesUtils.copyFile(defIdxFileSource, defIdxFileTarget);
}
// add report header image & template files
String reportingBundlePath = PluginChecker.getBundlePath("org.talend.dataquality.reporting"); //$NON-NLS-1$
File imageFolder = new File(reportingBundlePath + PATH_SEPARATOR + "images"); //$NON-NLS-1$
if (imageFolder.exists()) {
FilesUtils.copyDirectory(imageFolder, itemsFolderDir);
}
File templateFolder = new File(reportingBundlePath + PATH_SEPARATOR + "reports"); //$NON-NLS-1$
if (templateFolder.exists() && templateFolder.isDirectory()) {
FilesUtils.copyDirectory(templateFolder, itemsFolderDir);
}
// TDQ-10842 msjian: consider user defined report template files
String reportTemplateFolderName = "JRXML Template"; //$NON-NLS-1$
String reportTemplateFolderPath = defIdxFolderName + PATH_SEPARATOR + reportTemplateFolderName;
IFolder reportFolder = project.getFolder(reportTemplateFolderPath);
if (reportFolder.exists()) {
File reportFileSource = new File(project
.getLocation()
.makeAbsolute()
.append(defIdxFolderName)
.append(reportTemplateFolderName)
.toFile()
.toURI());
File reportFileTarget = new File(itemsProjectFolder
.getFile(defIdxFolderName)
.getLocation()
.toFile()
.getAbsolutePath());
FilesUtils.copyDirectory(reportFileSource, reportFileTarget);
}
// TDQ-10842~
if (PluginChecker.isRefProjectLoaded() && ProjectManager.getInstance().getAllReferencedProjects().size() > 0) {
handleMulitProjectCase(parentFolder, initProList, item);
} else {
handleSingleProjectCase(parentFolder, tdqItemService, item);
}
}
}
}
private void handleMulitProjectCase(IFolder parentFolder, List<Project> initProList, Item item) throws IOException {
Project pro = ProjectManager.getInstance().getProject(item);
if (!initProList.contains(pro)) {
initProList.add(pro);
copyDQSystemFile(parentFolder, pro);
}
}
protected void copyDQSystemFile(IFolder parentFolder, Project pro) throws IOException {
setNeedItemDependencies(true);
// add .Talend.definition file
String defIdxFolderName = "TDQ_Libraries"; //$NON-NLS-1$
String defIdxFileName = ".Talend.definition"; //$NON-NLS-1$
IFolder itemsProjectFolder = parentFolder.getFolder(pro.getTechnicalLabel().toLowerCase());
File itemsFolderDir = new File(parentFolder.getLocation().toFile().getAbsolutePath());
IProject project = ReponsitoryContextBridge.findProject(pro.getTechnicalLabel());
String defIdxRelativePath = defIdxFolderName + PATH_SEPARATOR + defIdxFileName;
IFile defIdxFile = project.getFile(defIdxRelativePath);
if (defIdxFile.exists()) {
File defIdxFileSource = new File(project.getLocation().makeAbsolute().append(defIdxFolderName).append(defIdxFileName).toFile().toURI());
File defIdxFileTarget = new File(itemsProjectFolder.getFile(defIdxRelativePath).getLocation().toFile().getAbsolutePath());
FilesUtils.copyFile(defIdxFileSource, defIdxFileTarget);
}
// add report header image & template files
String reportingBundlePath = PluginChecker.getBundlePath("org.talend.dataquality.reporting"); //$NON-NLS-1$
File imageFolder = new File(reportingBundlePath + PATH_SEPARATOR + "images"); //$NON-NLS-1$
if (imageFolder.exists()) {
FilesUtils.copyDirectory(imageFolder, itemsFolderDir);
}
File templateFolder = new File(reportingBundlePath + PATH_SEPARATOR + "reports"); //$NON-NLS-1$
if (templateFolder.exists() && templateFolder.isDirectory()) {
FilesUtils.copyDirectory(templateFolder, itemsFolderDir);
}
// TDQ-10842 msjian: consider user defined report template files
String reportTemplateFolderName = "JRXML Template"; //$NON-NLS-1$
String reportTemplateFolderPath = defIdxFolderName + PATH_SEPARATOR + reportTemplateFolderName;
IFolder reportFolder = project.getFolder(reportTemplateFolderPath);
if (reportFolder.exists()) {
File reportFileSource = new File(project.getLocation().makeAbsolute().append(defIdxFolderName).append(reportTemplateFolderName).toFile().toURI());
File reportFileTarget = new File(itemsProjectFolder.getFile(defIdxFolderName).getLocation().toFile().getAbsolutePath());
FilesUtils.copyDirectory(reportFileSource, reportFileTarget);
}
// TDQ-10842~
}
private void handleSingleProjectCase(IFolder parentFolder, ITDQItemService tdqItemService, Item item) throws IOException {
Project pro = getProject(processItem);
if (tdqItemService != null && tdqItemService.hasProcessItemDependencies(Arrays.asList(new Item[] { item }))) {
copyDQSystemFile(parentFolder, pro);
}
}
@Override
public void build(IProgressMonitor monitor) throws Exception {
final IWorkspaceRunnable runnable = new IWorkspaceRunnable() {

View File

@@ -69,13 +69,24 @@ final java.util.Map<String, String> registry_metadata_<%=cid%> = new java.util.H
if (p.getFieldType() == EParameterFieldType.SCHEMA_TYPE) {
connections = NodeUtil.getOutgoingConnections(node, p.getContext());
} else {
//TODO may remove this and EParameterFieldType.TACOKIT_INPUT_SCHEMA support
connections = NodeUtil.getIncomingConnections(node, p.getContext());
}
IMetadataTable metaTable = null;
if(connections != null && !connections.isEmpty()) {
connection = connections.get(0);
metaTable = (connection!=null) ? connection.getMetadataTable() : null;
} else if("FLOW".equals(p.getContext())) {
//pass the connector schema when no output line case
//for example: tfixedflowinput==>tjdbcoutput, we need the column key/db column name info in studio design schema
List<IMetadataTable> metadataTables = node.getMetadataList();
if(metadataTables!=null && !metadataTables.isEmpty()) {
metaTable = metadataTables.get(0);
}
}
if(connection != null) {
IMetadataTable metaTable = connection.getMetadataTable();
if(metaTable != null) {
List<IMetadataColumn> columns = metaTable.getListColumns();
boolean hasDynamic = false;
for (int i = 0; i < columns.size(); i++) {

View File

@@ -12,8 +12,10 @@
*/
package org.talend.sdk.component.studio.metadata.model;
import static org.talend.sdk.component.studio.metadata.model.TaCoKitConfigurationModel.BuiltInKeys.*;
import static org.talend.sdk.component.studio.model.parameter.PropertyDefinitionDecorator.*;
import static org.talend.sdk.component.studio.metadata.model.TaCoKitConfigurationModel.BuiltInKeys.TACOKIT_CONFIG_ID;
import static org.talend.sdk.component.studio.metadata.model.TaCoKitConfigurationModel.BuiltInKeys.TACOKIT_CONFIG_PARENT_ID;
import static org.talend.sdk.component.studio.metadata.model.TaCoKitConfigurationModel.BuiltInKeys.TACOKIT_PARENT_ITEM_ID;
import static org.talend.sdk.component.studio.model.parameter.PropertyDefinitionDecorator.PATH_SEPARATOR;
import java.util.ArrayList;
import java.util.Arrays;

View File

@@ -50,6 +50,7 @@ import org.talend.repository.viewer.content.listener.ResourceCollectorVisitor;
import org.talend.sdk.component.server.front.model.ConfigTypeNode;
import org.talend.sdk.component.studio.Lookups;
import org.talend.sdk.component.studio.i18n.Messages;
import org.talend.sdk.component.studio.metadata.TaCoKitCache;
import org.talend.sdk.component.studio.metadata.model.TaCoKitConfigurationItemModel;
import org.talend.sdk.component.studio.metadata.model.TaCoKitConfigurationModel;
import org.talend.sdk.component.studio.metadata.node.ITaCoKitRepositoryNode;
@@ -353,6 +354,14 @@ public class TaCoKitMetadataContentProvider extends AbstractMetadataContentProvi
} else {
ERepositoryObjectType objectType = TaCoKitUtil.getOrCreateERepositoryObjectType(configTypeNode);
parentObj = ProxyRepositoryFactory.getInstance().getLastVersion(requiredParentId, null, objectType);
if (parentObj == null) {
TaCoKitCache taCoKitCache = Lookups.taCoKitCache();
ConfigTypeNode parentTypeNode = taCoKitCache.getConfigTypeNodeMap()
.get(configTypeNode.getParentId());
ERepositoryObjectType parentObjectType = TaCoKitUtil
.getOrCreateERepositoryObjectType(parentTypeNode);
parentObj = ProxyRepositoryFactory.getInstance().getLastVersion(requiredParentId, parentObjectType);
}
if (parentObj != null) {
objectMap.put(requiredParentId, parentObj);
}

Some files were not shown because too many files have changed in this diff Show More