Compare commits
55 Commits
bugfix/mas
...
release/7.
| Author | SHA1 | Date | |
|---|---|---|---|
|
3b41874917 | ||
|
|
357c94c3a2 | ||
|
|
6ff9e7192f | ||
|
|
72ced3ab72 | ||
|
|
e19ccec64a | ||
|
|
603d84c50b | ||
|
|
9b4fe691d7 | ||
|
|
1795ff0600 | ||
|
|
cc57cba599 | ||
|
|
3fb4d63b1d | ||
|
|
cb77eef4dd | ||
|
|
d78ed3973b | ||
|
|
f248929661 | ||
|
|
6259d1fb44 | ||
|
|
8815482148 | ||
|
|
0033f23dff | ||
|
|
4f32054c45 | ||
|
|
fd852a3f42 | ||
|
|
1866b07ba3 | ||
|
|
31e017658f | ||
|
|
eef92394a1 | ||
|
|
c41fe280f3 | ||
|
|
84d5f6c822 | ||
|
|
79b9d07ab2 | ||
|
|
700aa890c6 | ||
|
|
b0eaef3bb5 | ||
|
|
6154224845 | ||
|
|
d0d6c3f97d | ||
|
|
d8ce933b27 | ||
|
|
673b18b62b | ||
|
|
d3b07c29d1 | ||
|
|
967b49f25d | ||
|
|
9429366f66 | ||
|
|
256002c49a | ||
|
|
13ed880081 | ||
|
|
e1bcf2e963 | ||
|
|
19d40f24db | ||
|
|
52bfb2e8d3 | ||
|
|
89cf326ab4 | ||
|
|
21f239cac2 | ||
|
|
1f8d681522 | ||
|
|
6e9fe76db8 | ||
|
|
7cbf85d150 | ||
|
|
3c5b3b353e | ||
|
|
532c15eb45 | ||
|
|
307c833488 | ||
|
|
138bdc5d47 | ||
|
|
011946574c | ||
|
|
a22fa846c4 | ||
|
|
9db6ddf29b | ||
|
|
a8ac292aad | ||
|
|
c4e1d8bda6 | ||
|
|
f8854adc93 | ||
|
|
297dec3f60 | ||
|
|
170cb6d018 |
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.common.ui.runtime.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.runtime.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.ui.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.repository.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.runtime.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.ui.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.cwm.mip.edit.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.cwm.mip.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.ui.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.help.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.helpers.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.librariesmanager.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.librariesmanager.ui.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.metadata.managment.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.metadata.managment.ui.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.migrationTool.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.model.edit.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.model.migration.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.model.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.presentation.onboarding.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.registration.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.items.importexport.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.localprovider.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.mdm.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.metadata.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.view.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.resources.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.fragment.jars.common.feature</artifactId>
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
bin.includes = feature.xml
|
||||
43
main/features/org.talend.help.di.feature/feature.xml
Normal file
43
main/features/org.talend.help.di.feature/feature.xml
Normal file
@@ -0,0 +1,43 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<feature
|
||||
id="org.talend.help.di.feature"
|
||||
label="Talend DI help feature"
|
||||
version="7.3.1.qualifier"
|
||||
provider-name=".Talend SA.">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
[Enter Feature Description here.]
|
||||
</description>
|
||||
|
||||
<copyright url="http://www.example.com/copyright">
|
||||
[Enter Copyright Description here.]
|
||||
</copyright>
|
||||
|
||||
<license url="http://www.example.com/license">
|
||||
[Enter License Description here.]
|
||||
</license>
|
||||
|
||||
<url>
|
||||
<update label="CORE Talend update site for milestones" url="http://talendforge.org/core/updatesite/testing/"/>
|
||||
</url>
|
||||
|
||||
<includes
|
||||
id="org.talend.help.tos.components.feature"
|
||||
version="0.0.0"/>
|
||||
|
||||
<plugin
|
||||
id="org.talend.help"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.talend.help.nl"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
|
||||
</feature>
|
||||
12
main/features/org.talend.help.di.feature/pom.xml
Normal file
12
main/features/org.talend.help.di.feature/pom.xml
Normal file
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.help.di.feature</artifactId>
|
||||
<packaging>eclipse-feature</packaging>
|
||||
</project>
|
||||
@@ -1,5 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.help.feature" label="Help Feature" version="7.3.1.qualifier" provider-name=".Talend SA.">
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#help-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#help-feature</description>
|
||||
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
|
||||
@@ -8,9 +7,8 @@
|
||||
<update label="CORE Talend update site for milestones" url="http://talendforge.org/core/updatesite/testing/"/>
|
||||
<discovery label="Talend web site" url="http://www.talend.com"/>
|
||||
</url>
|
||||
<includes id="org.talend.help.di.feature" version="0.0.0"/>
|
||||
<requires>
|
||||
<import feature="org.eclipse.help" version="0.0.0" match="greaterOrEqual"/>
|
||||
</requires>
|
||||
<plugin id="org.talend.help" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
<plugin id="org.talend.help.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
</feature>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.help.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.jdt.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.jdbc.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.m2e.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.model.migration.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.update.p2.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.updates.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.utils.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.common.ui.runtime</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.runtime</artifactId>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend</groupId>
|
||||
<artifactId>org.talend.tos</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../pom_server.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2019 Talend Inc. - www.talend.com
|
||||
//
|
||||
// This source code is available under agreement available at
|
||||
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
|
||||
//
|
||||
// You should have received a copy of the agreement
|
||||
// along with this program; if not, write to Talend SA
|
||||
// 9 rue Pages 92150 Suresnes, France
|
||||
//
|
||||
// ============================================================================
|
||||
package org.talend.commons.exception;
|
||||
|
||||
public class InformException extends PersistenceException {
|
||||
|
||||
/**
|
||||
* Show message of info level.
|
||||
*/
|
||||
private static final long serialVersionUID = 4181370042549074156L;
|
||||
|
||||
public InformException(String message) {
|
||||
super(message);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -15,6 +15,7 @@ package org.talend.commons.runtime.service;
|
||||
import java.io.File;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.Map;
|
||||
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.osgi.framework.BundleContext;
|
||||
@@ -39,9 +40,7 @@ public interface ITaCoKitService {
|
||||
|
||||
boolean isTaCoKitCar(File file, IProgressMonitor monitor) throws Exception;
|
||||
|
||||
boolean isNeedMigration(String projectLabel) throws Exception;
|
||||
|
||||
void checkMigration(final IProgressMonitor monitor) throws Exception;
|
||||
boolean isNeedMigration(String componentName, Map<String, String> properties);
|
||||
|
||||
public static ITaCoKitService getInstance() throws Exception {
|
||||
BundleContext bc = FrameworkUtil.getBundle(ITaCoKitService.class).getBundleContext();
|
||||
|
||||
@@ -193,8 +193,7 @@ public class VersionUtils {
|
||||
return talendVersion;
|
||||
}
|
||||
|
||||
public static String getTalendPureVersion(String fullProductVersion) {
|
||||
String version = fullProductVersion;
|
||||
public static String getProductVersionWithoutBranding(String fullProductVersion) {
|
||||
String[] splitStr = fullProductVersion.split("-"); //$NON-NLS-1$
|
||||
Pattern pattern = Pattern.compile("((\\d+\\.){2}\\d.*)"); //$NON-NLS-1$
|
||||
StringBuffer versionStr = new StringBuffer();
|
||||
@@ -211,7 +210,21 @@ public class VersionUtils {
|
||||
}
|
||||
}
|
||||
|
||||
return getTalendVersion(versionStr.toString());
|
||||
return versionStr.toString();
|
||||
}
|
||||
|
||||
public static String getTalendPureVersion(String fullProductVersion) {
|
||||
return getTalendVersion(getProductVersionWithoutBranding(fullProductVersion));
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if studio version < other studio version record in remote project.
|
||||
*/
|
||||
public static boolean isInvalidProductVersion(String remoteFullProductVersion) {
|
||||
if (remoteFullProductVersion == null) {
|
||||
return false;
|
||||
}
|
||||
return getInternalVersion().compareTo(getProductVersionWithoutBranding(remoteFullProductVersion)) < 0;
|
||||
}
|
||||
|
||||
public static String getTalendVersion(String productVersion) {
|
||||
|
||||
@@ -53,9 +53,10 @@ public class NetworkUtil {
|
||||
try {
|
||||
URL url = new URL(HTTP_NETWORK_URL);
|
||||
conn = (HttpURLConnection) url.openConnection();
|
||||
conn.setDefaultUseCaches(false);
|
||||
conn.setUseCaches(false);
|
||||
conn.setConnectTimeout(4000);
|
||||
conn.setReadTimeout(4000);
|
||||
|
||||
conn.setRequestMethod("HEAD"); //$NON-NLS-1$
|
||||
String strMessage = conn.getResponseMessage();
|
||||
if (strMessage.compareTo("Not Found") == 0) { //$NON-NLS-1$
|
||||
@@ -84,6 +85,8 @@ public class NetworkUtil {
|
||||
try {
|
||||
URL url = new URL(urlString);
|
||||
conn = (HttpURLConnection) url.openConnection();
|
||||
conn.setDefaultUseCaches(false);
|
||||
conn.setUseCaches(false);
|
||||
conn.setConnectTimeout(4000);
|
||||
conn.setReadTimeout(4000);
|
||||
conn.setRequestMethod("HEAD"); //$NON-NLS-1$
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.ui</artifactId>
|
||||
|
||||
@@ -67,11 +67,15 @@ public abstract class ProgressDialog {
|
||||
if (parentShell != null) {
|
||||
display2 = parentShell.getDisplay();
|
||||
}
|
||||
if (display2 == null) {
|
||||
display2 = Display.getDefault();
|
||||
}
|
||||
final Display display = display2;
|
||||
final InvocationTargetException[] iteHolder = new InvocationTargetException[1];
|
||||
try {
|
||||
final IRunnableWithProgress op = new IRunnableWithProgress() {
|
||||
|
||||
@Override
|
||||
public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
|
||||
final InvocationTargetException[] iteHolder1 = new InvocationTargetException[1];
|
||||
try {
|
||||
@@ -96,6 +100,7 @@ public abstract class ProgressDialog {
|
||||
if (useAsync) {
|
||||
display.asyncExec(new Runnable() {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
final ProgressMonitorDialog progressMonitorDialog = newProgressMonitorDialog(parentShell);
|
||||
if (timeBeforeShowDialog > 0) {
|
||||
@@ -106,6 +111,7 @@ public abstract class ProgressDialog {
|
||||
AsynchronousThreading asynchronousThreading = new AsynchronousThreading(timeBeforeShowDialog, true,
|
||||
display, new Runnable() {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
openDialog(progressMonitorDialog);
|
||||
}
|
||||
@@ -128,6 +134,7 @@ public abstract class ProgressDialog {
|
||||
} else {
|
||||
display.syncExec(new Runnable() {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
final ProgressMonitorDialog progressMonitorDialog = newProgressMonitorDialog(parentShell);
|
||||
if (timeBeforeShowDialog > 0) {
|
||||
@@ -138,6 +145,7 @@ public abstract class ProgressDialog {
|
||||
AsynchronousThreading asynchronousThreading = new AsynchronousThreading(timeBeforeShowDialog, true,
|
||||
display, new Runnable() {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
openDialog(progressMonitorDialog);
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.repository</artifactId>
|
||||
|
||||
@@ -29,8 +29,6 @@ public interface FileConstants {
|
||||
|
||||
String RELATIONSHIP_FILE_NAME = "relationship.index"; //$NON-NLS-1$
|
||||
|
||||
String COMPONENT_FILE_NAME = "component.index"; //$NON-NLS-1$
|
||||
|
||||
String TALEND_RECYCLE_BIN_INDEX = "recycle_bin.index"; //$NON-NLS-1$
|
||||
|
||||
String MIGRATION_TASK_FILE_NAME = "migration_task.index"; //$NON-NLS-1$
|
||||
|
||||
@@ -2078,7 +2078,9 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
|
||||
try {
|
||||
currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
|
||||
currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.load.sdk.componnents"), 1); // $NON-NLS-1$
|
||||
ITaCoKitService.getInstance().start();
|
||||
if (ITaCoKitService.getInstance() != null) {
|
||||
ITaCoKitService.getInstance().start();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
@@ -2228,18 +2230,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
|
||||
tdqRepositoryService.initProxyRepository();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Execute TaCoKit migration before fullLogonFinished
|
||||
*/
|
||||
try {
|
||||
ITaCoKitService tacokitService = ITaCoKitService.getInstance();
|
||||
if (tacokitService != null && tacokitService.isNeedMigration(project.getTechnicalLabel())) {
|
||||
tacokitService.checkMigration(monitor);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
fullLogonFinished = true;
|
||||
this.repositoryFactoryFromProvider.afterLogon(monitor);
|
||||
} finally {
|
||||
|
||||
@@ -1,124 +0,0 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2019 Talend Inc. - www.talend.com
|
||||
//
|
||||
// This source code is available under agreement available at
|
||||
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
|
||||
//
|
||||
// You should have received a copy of the agreement
|
||||
// along with this program; if not, write to Talend SA
|
||||
// 9 rue Pages 92150 Suresnes, France
|
||||
//
|
||||
// ============================================================================
|
||||
package org.talend.core.repository.utils;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
|
||||
/**
|
||||
* DOC jding class global comment. Detailled comment
|
||||
*/
|
||||
public class ComponentsJsonModel {
|
||||
|
||||
@JsonProperty("id")
|
||||
private String id;
|
||||
|
||||
@JsonProperty("version")
|
||||
private String version;
|
||||
|
||||
@JsonProperty("parentId")
|
||||
private String parentId;
|
||||
|
||||
@JsonProperty("configurationType")
|
||||
private String configurationType;
|
||||
|
||||
@JsonProperty("name")
|
||||
private String name;
|
||||
|
||||
@JsonProperty("displayName")
|
||||
private String displayName;
|
||||
|
||||
@JsonProperty("edges")
|
||||
private Set edges;
|
||||
|
||||
@JsonProperty("properties")
|
||||
private List properties;
|
||||
|
||||
@JsonProperty("actions")
|
||||
private Object actions;
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getVersion() {
|
||||
return version;
|
||||
}
|
||||
|
||||
public void setVersion(String version) {
|
||||
this.version = version;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getDisplayName() {
|
||||
return displayName;
|
||||
}
|
||||
|
||||
public void setDisplayName(String displayName) {
|
||||
this.displayName = displayName;
|
||||
}
|
||||
|
||||
public String getParentId() {
|
||||
return parentId;
|
||||
}
|
||||
|
||||
public void setParentId(String parentId) {
|
||||
this.parentId = parentId;
|
||||
}
|
||||
|
||||
public String getConfigurationType() {
|
||||
return configurationType;
|
||||
}
|
||||
|
||||
public void setConfigurationType(String configurationType) {
|
||||
this.configurationType = configurationType;
|
||||
}
|
||||
|
||||
public Set getEdges() {
|
||||
return edges;
|
||||
}
|
||||
|
||||
public void setEdges(Set edges) {
|
||||
this.edges = edges;
|
||||
}
|
||||
|
||||
public List getProperties() {
|
||||
return properties;
|
||||
}
|
||||
|
||||
public void setProperties(List properties) {
|
||||
this.properties = properties;
|
||||
}
|
||||
|
||||
public Object getActions() {
|
||||
return actions;
|
||||
}
|
||||
|
||||
public void setActions(Object actions) {
|
||||
this.actions = actions;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -18,13 +18,10 @@ import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
@@ -106,54 +103,6 @@ public class ProjectDataJsonProvider {
|
||||
}
|
||||
}
|
||||
|
||||
public static void saveConfigComponent(String projectLabel, List<ComponentsJsonModel> componentJsons)
|
||||
throws PersistenceException {
|
||||
Collections.sort(componentJsons, new Comparator<ComponentsJsonModel>() {
|
||||
|
||||
@Override
|
||||
public int compare(ComponentsJsonModel configTypeNode1, ComponentsJsonModel configTypeNode2) {
|
||||
return configTypeNode1.getId().compareTo(configTypeNode2.getId());
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
File file = getSavingConfigurationFile(projectLabel, FileConstants.COMPONENT_FILE_NAME);
|
||||
try {
|
||||
if (!file.exists()) {
|
||||
file.createNewFile();
|
||||
}
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
objectMapper.writerWithDefaultPrettyPrinter().writeValue(file, componentJsons);
|
||||
ResourceUtils.getProject(projectLabel).getFolder(FileConstants.SETTINGS_FOLDER_NAME).refreshLocal(1, null);
|
||||
} catch (Exception e) {
|
||||
throw new PersistenceException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public static Map<String, String[]> getLastConfigComponent(String projectLabel) throws PersistenceException {
|
||||
Map<String, String[]> componentMap = new HashMap<>();
|
||||
File file = getSavingConfigurationFile(projectLabel, FileConstants.COMPONENT_FILE_NAME);
|
||||
TypeReference<List<ComponentsJsonModel>> typeReference = new TypeReference<List<ComponentsJsonModel>>() {
|
||||
};
|
||||
List<ComponentsJsonModel> componentsJsons = null;
|
||||
if (file != null && file.exists()) {
|
||||
try {
|
||||
FileInputStream input = new FileInputStream(file);
|
||||
componentsJsons = new ObjectMapper().readValue(input, typeReference);
|
||||
} catch (IOException e) {
|
||||
throw new PersistenceException(e);
|
||||
}
|
||||
if (componentsJsons != null && componentsJsons.size() > 0) {
|
||||
for (ComponentsJsonModel component : componentsJsons) {
|
||||
String[] content = new String[] { component.getName(), component.getVersion(), component.getDisplayName() };
|
||||
componentMap.put(component.getId(), content);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return componentMap;
|
||||
}
|
||||
|
||||
public static void loadProjectData(Project project, IPath projectFolderPath, int loadContent) throws PersistenceException {
|
||||
if ((loadContent & CONTENT_PROJECTSETTING) > 0) {
|
||||
loadProjectSettings(project, projectFolderPath);
|
||||
@@ -166,8 +115,8 @@ public class ProjectDataJsonProvider {
|
||||
RecycleBinManager.getInstance().clearCache(project);
|
||||
RecycleBin recycleBin = RecycleBinManager.getInstance().getRecycleBin(project);
|
||||
project.getDeletedFolders().clear();
|
||||
for (int i = 0; i < recycleBin.getDeletedFolders().size(); i++) {
|
||||
project.getDeletedFolders().add(recycleBin.getDeletedFolders().get(i));
|
||||
for (String element : recycleBin.getDeletedFolders()) {
|
||||
project.getDeletedFolders().add(element);
|
||||
}
|
||||
}
|
||||
if ((loadContent & CONTENT_MIGRATIONTASK) > 0) {
|
||||
@@ -285,8 +234,8 @@ public class ProjectDataJsonProvider {
|
||||
if (migrationTaskSetting != null) {
|
||||
MigrationTask fakeTask = createFakeMigrationTask();
|
||||
MigrationTask existingFakeTask = null;
|
||||
for (int i = 0; i < project.getMigrationTask().size(); i++) {
|
||||
MigrationTask task = (MigrationTask) project.getMigrationTask().get(i);
|
||||
for (Object element : project.getMigrationTask()) {
|
||||
MigrationTask task = (MigrationTask) element;
|
||||
if (StringUtils.equals(fakeTask.getId(), task.getId())) {
|
||||
existingFakeTask = task;
|
||||
break;
|
||||
@@ -471,8 +420,8 @@ public class ProjectDataJsonProvider {
|
||||
protected static List<StatusJson> getTechnicalStatusJson(List technicalStatus) {
|
||||
if (technicalStatus != null && technicalStatus.size() > 0) {
|
||||
List<StatusJson> list = new ArrayList<StatusJson>(technicalStatus.size());
|
||||
for (int i = 0; i < technicalStatus.size(); i++) {
|
||||
StatusJson json = new StatusJson((Status) technicalStatus.get(i));
|
||||
for (Object technicalStatu : technicalStatus) {
|
||||
StatusJson json = new StatusJson((Status) technicalStatu);
|
||||
list.add(json);
|
||||
}
|
||||
return list;
|
||||
@@ -492,8 +441,8 @@ public class ProjectDataJsonProvider {
|
||||
protected static List<StatusJson> getDocumentationJson(List documentationStatus) {
|
||||
if (documentationStatus != null && documentationStatus.size() > 0) {
|
||||
List<StatusJson> list = new ArrayList<StatusJson>(documentationStatus.size());
|
||||
for (int i = 0; i < documentationStatus.size(); i++) {
|
||||
StatusJson json = new StatusJson((Status) documentationStatus.get(i));
|
||||
for (Object documentationStatu : documentationStatus) {
|
||||
StatusJson json = new StatusJson((Status) documentationStatu);
|
||||
list.add(json);
|
||||
}
|
||||
return list;
|
||||
@@ -513,8 +462,8 @@ public class ProjectDataJsonProvider {
|
||||
protected static List<ItemRelationsJson> getItemRelationsJson(List itemsRelations) {
|
||||
if (itemsRelations.size() > 0) {
|
||||
List<ItemRelationsJson> list = new ArrayList<ItemRelationsJson>(itemsRelations.size());
|
||||
for (int i = 0; i < itemsRelations.size(); i++) {
|
||||
ItemRelations relations = (ItemRelations) itemsRelations.get(i);
|
||||
for (Object itemsRelation : itemsRelations) {
|
||||
ItemRelations relations = (ItemRelations) itemsRelation;
|
||||
ItemRelationsJson json = new ItemRelationsJson(relations);
|
||||
list.add(json);
|
||||
}
|
||||
@@ -639,16 +588,16 @@ class ParametersTypeJson {
|
||||
public ParametersTypeJson(ParametersType parametersType) {
|
||||
if (parametersType.getElementParameter().size() > 0) {
|
||||
elementParameters = new ArrayList<ElementParameterTypeJson>();
|
||||
for (int i = 0; i < parametersType.getElementParameter().size(); i++) {
|
||||
ElementParameterType type = (ElementParameterType) parametersType.getElementParameter().get(i);
|
||||
for (Object element : parametersType.getElementParameter()) {
|
||||
ElementParameterType type = (ElementParameterType) element;
|
||||
ElementParameterTypeJson typeJson = new ElementParameterTypeJson(type);
|
||||
elementParameters.add(typeJson);
|
||||
}
|
||||
}
|
||||
if (parametersType.getRoutinesParameter().size() > 0) {
|
||||
routinesParameters = new ArrayList<RoutinesParameterTypeJson>();
|
||||
for (int i = 0; i < parametersType.getRoutinesParameter().size(); i++) {
|
||||
RoutinesParameterType type = (RoutinesParameterType) parametersType.getRoutinesParameter().get(i);
|
||||
for (Object element : parametersType.getRoutinesParameter()) {
|
||||
RoutinesParameterType type = (RoutinesParameterType) element;
|
||||
RoutinesParameterTypeJson typeJson = new RoutinesParameterTypeJson(type);
|
||||
routinesParameters.add(typeJson);
|
||||
}
|
||||
@@ -722,8 +671,8 @@ class ElementParameterTypeJson {
|
||||
this.isShow = type.isShow();
|
||||
if (type.getElementValue().size() > 0) {
|
||||
elementValues = new ArrayList<ElementValueTypeJson>();
|
||||
for (int i = 0; i < type.getElementValue().size(); i++) {
|
||||
ElementValueType value = (ElementValueType) type.getElementValue().get(i);
|
||||
for (Object element : type.getElementValue()) {
|
||||
ElementValueType value = (ElementValueType) element;
|
||||
ElementValueTypeJson valueJson = new ElementValueTypeJson(value);
|
||||
elementValues.add(valueJson);
|
||||
}
|
||||
@@ -953,8 +902,8 @@ class ItemRelationsJson {
|
||||
}
|
||||
if (relations.getRelatedItems().size() > 0) {
|
||||
relatedItems = new ArrayList<ItemRelationJson>(relations.getRelatedItems().size());
|
||||
for (int i = 0; i < relations.getRelatedItems().size(); i++) {
|
||||
relatedItems.add(new ItemRelationJson((ItemRelation) relations.getRelatedItems().get(i)));
|
||||
for (Object element : relations.getRelatedItems()) {
|
||||
relatedItems.add(new ItemRelationJson((ItemRelation) element));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1101,8 +1050,8 @@ class MigrationTaskSetting {
|
||||
if (project != null) {
|
||||
if (project.getMigrationTask().size() > 0) {
|
||||
migrationTaskList = new ArrayList<MigrationTaskJson>();
|
||||
for (int i = 0; i < project.getMigrationTask().size(); i++) {
|
||||
MigrationTask task = (MigrationTask) project.getMigrationTask().get(i);
|
||||
for (Object element : project.getMigrationTask()) {
|
||||
MigrationTask task = (MigrationTask) element;
|
||||
migrationTaskList.add(new MigrationTaskJson(task));
|
||||
}
|
||||
migrationTaskList.sort(new Comparator<MigrationTaskJson>() {
|
||||
@@ -1119,8 +1068,8 @@ class MigrationTaskSetting {
|
||||
}
|
||||
if (project.getMigrationTasks().size() > 0) {
|
||||
migrationTasksList = new ArrayList<String>();
|
||||
for (int i = 0; i < project.getMigrationTasks().size(); i++) {
|
||||
String task = (String) project.getMigrationTasks().get(i);
|
||||
for (Object element : project.getMigrationTasks()) {
|
||||
String task = (String) element;
|
||||
migrationTasksList.add(task);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,6 +52,7 @@ Export-Package: org.talend.commons.utils.generation,
|
||||
org.talend.core.prefs,
|
||||
org.talend.core.repository,
|
||||
org.talend.core.runtime,
|
||||
org.talend.core.runtime.constants,
|
||||
org.talend.core.runtime.dynamic,
|
||||
org.talend.core.runtime.evaluator,
|
||||
org.talend.core.runtime.hd,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.runtime</artifactId>
|
||||
|
||||
@@ -66,7 +66,7 @@ public class PluginChecker {
|
||||
|
||||
private static final String GIT_PROVIDER_PLUGIN_ID = "org.talend.repository.gitprovider"; //$NON-NLS-1$
|
||||
|
||||
private static final String CORE_TIS_PLUGIN_ID = "org.talend.core.tis"; //$NON-NLS-1$
|
||||
public static final String CORE_TIS_PLUGIN_ID = "org.talend.core.tis"; //$NON-NLS-1$
|
||||
|
||||
private static final String HL7_PLUGIN_ID = "org.talend.repository.hl7"; //$NON-NLS-1$
|
||||
|
||||
|
||||
@@ -98,6 +98,12 @@ public class ConnParameterKeys {
|
||||
|
||||
public static final String CONN_PARA_KEY_MAPRTICKET_MAPRHADOOPLOGIN = "CONN_PARA_KEY_MAPRTICKET_MAPRHADOOPLOGIN"; //$NON-NLS-1$
|
||||
|
||||
public static final String CONN_PARA_KEY_USE_WEBHDFS_SSL = "CONN_PARA_KEY_USE_WEBHDFS_SSL";//$NON-NLS-1$
|
||||
|
||||
public static final String CONN_PARA_KEY_WEBHDFS_SSL_TRUST_STORE_PATH = "CONN_PARA_KEY_WEBHDFS_SSL_TRUST_STORE_PATH"; //$NON-NLS-1$
|
||||
|
||||
public static final String CONN_PARA_KEY_WEBHDFS_SSL_TRUST_STORE_PASSWORD = "CONN_PARA_KEY_WEBHDFS_SSL_TRUST_STORE_PASSWORD"; //$NON-NLS-1$
|
||||
|
||||
/**
|
||||
* Hive keys.
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2019 Talend Inc. - www.talend.com
|
||||
//
|
||||
// This source code is available under agreement available at
|
||||
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
|
||||
//
|
||||
// You should have received a copy of the agreement
|
||||
// along with this program; if not, write to Talend SA
|
||||
// 9 rue Pages 92150 Suresnes, France
|
||||
//
|
||||
// ============================================================================
|
||||
package org.talend.core.hadoop;
|
||||
|
||||
import java.net.MalformedURLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.core.classloader.DynamicClassLoader;
|
||||
/**
|
||||
* created by hcyi on Dec 3, 2019
|
||||
* Detailled comment
|
||||
*
|
||||
*/
|
||||
public class HadoopClassLoaderUtil {
|
||||
|
||||
public final static String[] webhdfsExtraJars = { "jersey-core-1.9.jar", "jersey-client-1.9.jar", "jetty-util-6.1.26.jar" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
private final static String[] webhdfsExtraJarNames = { "jersey-core", "jersey-client", "jetty-util" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
public static boolean isWebHDFS(String nameNodeURI) {
|
||||
if (nameNodeURI != null
|
||||
&& (nameNodeURI.toLowerCase().startsWith("swebhdfs://") || nameNodeURI.toLowerCase().startsWith("webhdfs://"))) {//$NON-NLS-1$ //$NON-NLS-2$
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static ClassLoader addExtraJars(ClassLoader classLoader, EHadoopCategory category, String nameNodeURI) {
|
||||
if (isWebHDFS(nameNodeURI) && classLoader != null && classLoader instanceof DynamicClassLoader) {
|
||||
DynamicClassLoader loader = (DynamicClassLoader) classLoader;
|
||||
switch (category) {
|
||||
case HDFS:
|
||||
List<String> excludedJars = new ArrayList<String>();
|
||||
Set<String> libraries = loader.getLibraries();
|
||||
for (String lib : libraries) {
|
||||
for (int i = 0; i < webhdfsExtraJarNames.length; i++) {
|
||||
if (lib.contains(webhdfsExtraJarNames[i])) {
|
||||
excludedJars.add(webhdfsExtraJars[i]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (excludedJars.size() < 3) {
|
||||
List<String> addedJars = new ArrayList<String>();
|
||||
for (String webhdfsExtraJar : webhdfsExtraJars) {
|
||||
if (!excludedJars.contains(webhdfsExtraJar)) {
|
||||
addedJars.add(webhdfsExtraJar);
|
||||
}
|
||||
}
|
||||
try {
|
||||
classLoader = DynamicClassLoader.createNewOneBaseLoader(loader,
|
||||
addedJars.toArray(new String[addedJars.size()]), null);
|
||||
} catch (MalformedURLException e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
return classLoader;
|
||||
}
|
||||
}
|
||||
@@ -29,6 +29,7 @@ import org.talend.core.model.properties.ContextItem;
|
||||
import org.talend.core.model.properties.Item;
|
||||
import org.talend.core.model.repository.ERepositoryObjectType;
|
||||
import org.talend.core.model.repository.IRepositoryTypeProcessor;
|
||||
import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
|
||||
import org.talend.repository.model.IRepositoryNode;
|
||||
|
||||
/**
|
||||
@@ -264,4 +265,7 @@ public interface IHadoopClusterService extends IService {
|
||||
|
||||
public boolean updateConfJarsByContextGroup(ContextItem contextItem, Map<String, String> contextGroupRanamedMap);
|
||||
|
||||
public ContextType getHadoopClusterContextType(String id);
|
||||
|
||||
public Map<String, String> getHadoopSSLParameters(String clusterId);
|
||||
}
|
||||
|
||||
@@ -22,15 +22,18 @@ import java.util.Map.Entry;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
import org.talend.core.hadoop.HadoopClassLoaderUtil;
|
||||
import org.talend.core.hadoop.IHadoopClusterService;
|
||||
import org.talend.core.model.metadata.builder.connection.Connection;
|
||||
import org.talend.core.model.utils.ContextParameterUtils;
|
||||
import org.talend.core.prefs.SSLPreferenceConstants;
|
||||
import org.talend.core.service.IMetadataManagmentUiService;
|
||||
import org.talend.core.utils.TalendQuoteUtils;
|
||||
import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
|
||||
import org.talend.utils.json.JSONArray;
|
||||
import org.talend.utils.json.JSONException;
|
||||
import org.talend.utils.json.JSONObject;
|
||||
import org.talend.utils.security.StudioEncryption;
|
||||
|
||||
/**
|
||||
* created by ycbai on 2013-10-24 Detailled comment
|
||||
@@ -175,7 +178,7 @@ public class HadoopRepositoryUtil {
|
||||
List<Map<String, Object>> properties = null;
|
||||
IMetadataManagmentUiService mmUIService = null;
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(IMetadataManagmentUiService.class)) {
|
||||
mmUIService = (IMetadataManagmentUiService) GlobalServiceRegister.getDefault().getService(
|
||||
mmUIService = GlobalServiceRegister.getDefault().getService(
|
||||
IMetadataManagmentUiService.class);
|
||||
}
|
||||
ContextType contextType = null;
|
||||
@@ -325,10 +328,23 @@ public class HadoopRepositoryUtil {
|
||||
public static IHadoopClusterService getHadoopClusterService() {
|
||||
IHadoopClusterService hadoopClusterService = null;
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopClusterService.class)) {
|
||||
hadoopClusterService = (IHadoopClusterService) GlobalServiceRegister.getDefault().getService(
|
||||
hadoopClusterService = GlobalServiceRegister.getDefault().getService(
|
||||
IHadoopClusterService.class);
|
||||
}
|
||||
return hadoopClusterService;
|
||||
}
|
||||
|
||||
public static void setSSLSystemProperty(boolean isUseSSL, String nameNodeURI, String trustStorePath,
|
||||
String trustStorePassword) {
|
||||
if (isUseSSL) {
|
||||
System.setProperty(SSLPreferenceConstants.TRUSTSTORE_FILE, trustStorePath);
|
||||
System.setProperty(SSLPreferenceConstants.TRUSTSTORE_PASSWORD,
|
||||
StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.SYSTEM).decrypt(trustStorePassword));
|
||||
} else {
|
||||
if (HadoopClassLoaderUtil.isWebHDFS(nameNodeURI)) {
|
||||
System.clearProperty(SSLPreferenceConstants.TRUSTSTORE_FILE);
|
||||
System.clearProperty(SSLPreferenceConstants.TRUSTSTORE_PASSWORD);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -167,9 +167,9 @@ public interface IMetadataConnection extends IMetadata {
|
||||
|
||||
public void setOtherParameter(String otherParameter);
|
||||
|
||||
public String getDbName();
|
||||
public String getWarehouse();
|
||||
|
||||
public void setDbName(String dbName);
|
||||
public void setWarehouse(String warehouse);
|
||||
|
||||
public String getUiSchema();
|
||||
|
||||
|
||||
@@ -100,7 +100,10 @@ public class MetadataConnection implements IMetadataConnection {
|
||||
|
||||
private String otherParameter;
|
||||
|
||||
private String dbName;
|
||||
/**
|
||||
* TDQ-17294: used for support snowflake warehouse.
|
||||
*/
|
||||
private String warehouse;
|
||||
|
||||
private String uiSchema;
|
||||
|
||||
@@ -671,12 +674,12 @@ public class MetadataConnection implements IMetadataConnection {
|
||||
this.otherParameter = otherParameter;
|
||||
}
|
||||
|
||||
public String getDbName() {
|
||||
return dbName;
|
||||
public String getWarehouse() {
|
||||
return warehouse;
|
||||
}
|
||||
|
||||
public void setDbName(String dbName) {
|
||||
this.dbName = dbName;
|
||||
public void setWarehouse(String warehouse) {
|
||||
this.warehouse = warehouse;
|
||||
}
|
||||
|
||||
public String getUiSchema() {
|
||||
|
||||
@@ -319,7 +319,7 @@ public class ComponentToRepositoryProperty {
|
||||
}
|
||||
IGenericDBService dbService = null;
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericDBService.class)) {
|
||||
dbService = (IGenericDBService) GlobalServiceRegister.getDefault().getService(
|
||||
dbService = GlobalServiceRegister.getDefault().getService(
|
||||
IGenericDBService.class);
|
||||
}
|
||||
if(dbService == null){
|
||||
@@ -467,10 +467,10 @@ public class ComponentToRepositoryProperty {
|
||||
// Redshift
|
||||
else if (EDatabaseTypeName.REDSHIFT.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
|
||||
connection.setProductId(EDatabaseTypeName.REDSHIFT.getProduct());
|
||||
parameter = node.getElementParameter("TYPE"); //$NON-NLS-1$
|
||||
if ("Redshift SSO".equals(parameter.getValue())) {
|
||||
IElementParameter paraJdbcUrl = node.getElementParameter("JDBC_URL");
|
||||
if ("SSO".equals(paraJdbcUrl.getValue())) {
|
||||
connection.setDatabaseType(EDatabaseTypeName.REDSHIFT_SSO.getDisplayName());
|
||||
} else if ("Redshift".equals(parameter.getValue())) {
|
||||
} else if ("STANDARD".equals(paraJdbcUrl.getValue())) {
|
||||
connection.setDatabaseType(EDatabaseTypeName.REDSHIFT.getDisplayName());
|
||||
}
|
||||
}
|
||||
@@ -622,7 +622,8 @@ public class ComponentToRepositoryProperty {
|
||||
if ("SCHEMA".equals(param.getRepositoryValue())) { //$NON-NLS-1$
|
||||
String value = getParameterValue(connection, node, param);
|
||||
if (value != null) {
|
||||
if (connection.getDatabaseType().equals(EDatabaseTypeName.ORACLEFORSID.getDisplayName())) {
|
||||
if (connection.getDatabaseType().equals(EDatabaseTypeName.ORACLEFORSID.getDisplayName())
|
||||
&& !connection.isContextMode()) {
|
||||
connection.setUiSchema(TalendQuoteUtils.removeQuotes(value.toUpperCase()));
|
||||
} else {
|
||||
connection.setUiSchema(TalendQuoteUtils.removeQuotes(value));
|
||||
|
||||
@@ -2845,6 +2845,10 @@ public class RepositoryToComponentProperty {
|
||||
if (value.equals("USE_ENCODING")) {
|
||||
return connection.isUseFileNameEncoding();
|
||||
}
|
||||
|
||||
if(value.equals("CONNECTION_TIMEOUT")) {
|
||||
return connection.getTimeout();
|
||||
}
|
||||
|
||||
if (value.equals("ENCODING")) {
|
||||
if (isContextMode(connection, connection.getCustomEncode())) {
|
||||
|
||||
@@ -104,6 +104,9 @@ public class BigDataNode extends AbstractNode implements IBigDataNode {
|
||||
IBigDataNode node = (IBigDataNode) outgoingConnections.get(0).getTarget();
|
||||
String requiredInputType = node.getRequiredInputType();
|
||||
return (requiredInputType != null && !node.isIdentity()) ? requiredInputType : node.getOutgoingType();
|
||||
} else if (outConnection.getTarget() instanceof MapperExternalNode) {
|
||||
MapperExternalNode node = (MapperExternalNode) outConnection.getTarget();
|
||||
return node.getShouldGenerateDataset() ? "DATASET" : "KEYVALUE";
|
||||
} else {
|
||||
// We are on an external node => PairRDD
|
||||
// TODO Maybe on the futur we need to handle RDD or DataFrame, but this required a big refactoring
|
||||
|
||||
@@ -20,6 +20,7 @@ package org.talend.core.model.process;
|
||||
*/
|
||||
public enum EParameterFieldType {
|
||||
TEXT,
|
||||
NUMBERLIMITTEXT,
|
||||
TEXT_AREA,
|
||||
PASSWORD,
|
||||
LICENSEKEY, // xqliu TDQ-17742
|
||||
|
||||
@@ -16,7 +16,9 @@ import java.io.File;
|
||||
import java.util.Dictionary;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.http.HttpResponse;
|
||||
import org.talend.core.runtime.maven.MavenArtifact;
|
||||
import org.talend.utils.sugars.TypedReturnCode;
|
||||
|
||||
/**
|
||||
* created by wchen on Jul 31, 2017 Detailled comment
|
||||
@@ -30,6 +32,8 @@ public interface IRepositoryArtifactHandler {
|
||||
|
||||
public boolean checkConnection();
|
||||
|
||||
public TypedReturnCode<HttpResponse> getConnectionResultAndCode();
|
||||
|
||||
public boolean checkConnection(boolean checkRelease, boolean checkSnapshot);
|
||||
|
||||
/**
|
||||
|
||||
@@ -38,6 +38,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.core.runtime.NullProgressMonitor;
|
||||
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
|
||||
import org.eclipse.core.runtime.preferences.InstanceScope;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.core.prefs.ITalendCorePrefConstants;
|
||||
import org.talend.core.runtime.maven.MavenArtifact;
|
||||
|
||||
@@ -116,6 +117,49 @@ public class NexusServerUtils {
|
||||
}
|
||||
return status[0];
|
||||
}
|
||||
|
||||
public static HttpResponse getConnectionResponse(String nexusUrl, String repositoryId, final String userName,
|
||||
final String password) {
|
||||
if (StringUtils.isEmpty(nexusUrl) || StringUtils.isEmpty(repositoryId)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
String newUrl = nexusUrl;
|
||||
if (newUrl.endsWith(NexusConstants.SLASH)) {
|
||||
newUrl = newUrl.substring(0, newUrl.length() - 1);
|
||||
}
|
||||
String urlToCheck = newUrl + NexusConstants.CONTENT_REPOSITORIES + repositoryId;
|
||||
|
||||
return getConnectionResponse(urlToCheck, userName, password);
|
||||
}
|
||||
|
||||
public static HttpResponse getConnectionResponse(String nexusURL, String username, String password) {
|
||||
if (StringUtils.isEmpty(nexusURL)) {
|
||||
return null;
|
||||
}
|
||||
final List<HttpResponse> httpResponse = new ArrayList<>();
|
||||
try {
|
||||
NullProgressMonitor monitor = new NullProgressMonitor();
|
||||
new HttpClientTransport(nexusURL, username, password) {
|
||||
|
||||
@Override
|
||||
protected HttpResponse execute(IProgressMonitor monitor, DefaultHttpClient httpClient, URI targetURI)
|
||||
throws Exception {
|
||||
httpClient.getParams().setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, getTimeout());
|
||||
httpClient.getParams().setParameter(CoreConnectionPNames.SO_TIMEOUT, getTimeout());
|
||||
HttpHead httpHead = new HttpHead(targetURI);
|
||||
HttpResponse response = httpClient.execute(httpHead);
|
||||
httpResponse.add(response);
|
||||
return response;
|
||||
}
|
||||
|
||||
}.doRequest(monitor, new URI(nexusURL));
|
||||
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
return httpResponse.get(0);
|
||||
}
|
||||
|
||||
public static List<MavenArtifact> search(String nexusUrl, String userName, String password, String repositoryId,
|
||||
String groupIdToSearch, String versionToSearch) throws Exception {
|
||||
|
||||
@@ -14,6 +14,7 @@ package org.talend.core.nexus;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.commons.exception.LoginException;
|
||||
import org.talend.commons.exception.PersistenceException;
|
||||
@@ -21,6 +22,8 @@ import org.talend.core.GlobalServiceRegister;
|
||||
import org.talend.core.context.RepositoryContext;
|
||||
import org.talend.core.model.properties.User;
|
||||
import org.talend.core.runtime.CoreRuntimePlugin;
|
||||
import org.talend.core.runtime.i18n.Messages;
|
||||
import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
|
||||
import org.talend.core.service.IRemoteService;
|
||||
import org.talend.repository.model.IProxyRepositoryFactory;
|
||||
import org.talend.repository.model.RepositoryConstants;
|
||||
@@ -31,6 +34,8 @@ import org.talend.repository.model.RepositoryConstants;
|
||||
*/
|
||||
public class TalendLibsServerManager {
|
||||
|
||||
private ProjectPreferenceManager prefManager;
|
||||
|
||||
public static final String KEY_LIB_REPO_URL = "org.talend.libraries.repo.url";
|
||||
|
||||
private static String NEXUS_USER = "nexus.user";
|
||||
@@ -73,6 +78,8 @@ public class TalendLibsServerManager {
|
||||
|
||||
public static final String NEXUS_PROXY_REPOSITORY_ID = "nexus.proxy.repository.id";
|
||||
|
||||
public static final String ENABLE_PROXY_SETTING = "nexus.proxy.enable";
|
||||
|
||||
public static final String TALEND_LIB_USER = "";//$NON-NLS-1$
|
||||
|
||||
public static final String TALEND_LIB_PASSWORD = "";//$NON-NLS-1$
|
||||
@@ -175,16 +182,82 @@ public class TalendLibsServerManager {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* Check user library connection with the setting from remote administrator
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public boolean canConnectUserLibrary() {
|
||||
boolean canConnect = false;
|
||||
IProxyRepositoryFactory factory = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
|
||||
RepositoryContext repositoryContext = factory.getRepositoryContext();
|
||||
try {
|
||||
if (repositoryContext != null && repositoryContext.getFields() != null && !factory.isLocalConnectionProvider()
|
||||
&& !repositoryContext.isOffline()) {
|
||||
String adminUrl = repositoryContext.getFields().get(RepositoryConstants.REPOSITORY_URL);
|
||||
String userName = null;
|
||||
String password = null;
|
||||
User user = repositoryContext.getUser();
|
||||
if (user != null) {
|
||||
userName = user.getLogin();
|
||||
password = repositoryContext.getClearPassword();
|
||||
}
|
||||
|
||||
if (StringUtils.isNotBlank(adminUrl) && StringUtils.isNotBlank(userName) && StringUtils.isNotBlank(password)
|
||||
&& GlobalServiceRegister.getDefault().isServiceRegistered(IRemoteService.class)) {
|
||||
IRemoteService remoteService = (IRemoteService) GlobalServiceRegister.getDefault()
|
||||
.getService(IRemoteService.class);
|
||||
ArtifactRepositoryBean bean = remoteService.getLibNexusServer(userName, password, adminUrl);
|
||||
if (bean != null) {
|
||||
IRepositoryArtifactHandler handler = RepositoryArtifactHandlerManager.getRepositoryHandler(bean);
|
||||
if (handler.checkConnection()) {
|
||||
canConnect = true;
|
||||
} else {
|
||||
ExceptionHandler.process(new Throwable(Messages.getString(
|
||||
"TalendLibsServerManager.connectUserLibraryFailureMessage", bean.getServer()))); //$NON-NLS-1$
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
return canConnect;
|
||||
}
|
||||
|
||||
public ArtifactRepositoryBean getTalentArtifactServer() {
|
||||
ArtifactRepositoryBean serverBean = new ArtifactRepositoryBean();
|
||||
String nexusType = System.getProperty(NEXUS_PROXY_TYPE);
|
||||
if (nexusType != null) {
|
||||
serverBean.setType(nexusType);
|
||||
// get from ini file first
|
||||
String url = System.getProperty(NEXUS_PROXY_URL);
|
||||
if (StringUtils.isNotEmpty(url)) {
|
||||
serverBean.setServer(System.getProperty(NEXUS_PROXY_URL));
|
||||
serverBean.setUserName(System.getProperty(NEXUS_PROXY_USERNAME));
|
||||
serverBean.setPassword(System.getProperty(NEXUS_PROXY_PASSWORD));
|
||||
serverBean.setRepositoryId(System.getProperty(NEXUS_PROXY_REPOSITORY_ID));
|
||||
serverBean.setType(System.getProperty(NEXUS_PROXY_TYPE));
|
||||
}
|
||||
// if not set in ini file ,get from project setting
|
||||
boolean hasProxySetting = StringUtils.isNotEmpty(serverBean.getServer());
|
||||
if (!hasProxySetting) {
|
||||
prefManager = new ProjectPreferenceManager("org.talend.proxy.nexus", true);
|
||||
boolean enableProxyFlag = prefManager.getBoolean(TalendLibsServerManager.ENABLE_PROXY_SETTING);
|
||||
if (enableProxyFlag) {
|
||||
serverBean.setServer(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_URL));
|
||||
serverBean.setUserName(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_USERNAME));
|
||||
serverBean.setPassword(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_PASSWORD));
|
||||
serverBean.setRepositoryId(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_REPOSITORY_ID));
|
||||
serverBean.setType(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_TYPE));
|
||||
}
|
||||
}
|
||||
hasProxySetting = StringUtils.isNotEmpty(serverBean.getServer());
|
||||
// use default
|
||||
if (!hasProxySetting) {
|
||||
serverBean.setServer(TALEND_LIB_SERVER);
|
||||
serverBean.setUserName(TALEND_LIB_USER);
|
||||
serverBean.setPassword(TALEND_LIB_PASSWORD);
|
||||
serverBean.setRepositoryId(TALEND_LIB_REPOSITORY);
|
||||
}
|
||||
serverBean.setServer(System.getProperty(NEXUS_PROXY_URL, TALEND_LIB_SERVER));
|
||||
serverBean.setUserName(System.getProperty(NEXUS_PROXY_USERNAME, TALEND_LIB_USER));
|
||||
serverBean.setPassword(System.getProperty(NEXUS_PROXY_PASSWORD, TALEND_LIB_PASSWORD));
|
||||
serverBean.setRepositoryId(System.getProperty(NEXUS_PROXY_REPOSITORY_ID, TALEND_LIB_REPOSITORY));
|
||||
serverBean.setOfficial(true);
|
||||
return serverBean;
|
||||
}
|
||||
|
||||
@@ -202,4 +202,8 @@ public interface ITalendCorePrefConstants {
|
||||
|
||||
public static final String JACCARD_WEIGHT = "JACCARD_WEIGHT"; //$NON-NLS-1$
|
||||
|
||||
public static final int DYNAMIC_DISTRIBUTION_SETTING = 0;
|
||||
|
||||
public static final int ARTIFACT_PROXY_SETTING = 1;
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2019 Talend Inc. - www.talend.com
|
||||
//
|
||||
// This source code is available under agreement available at
|
||||
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
|
||||
//
|
||||
// You should have received a copy of the agreement
|
||||
// along with this program; if not, write to Talend SA
|
||||
// 9 rue Pages 92150 Suresnes, France
|
||||
//
|
||||
// ============================================================================
|
||||
package org.talend.core.runtime.constants;
|
||||
|
||||
public interface UpdateConstants {
|
||||
|
||||
static final String GROUP_PREFIX = "org.talend.studio.patch"; //$NON-NLS-1$
|
||||
|
||||
static final String GROUP_UPDATESITE = GROUP_PREFIX + ".updatesite"; //$NON-NLS-1$
|
||||
|
||||
static final String GROUP_MONTHLY = GROUP_PREFIX + ".monthly"; //$NON-NLS-1$
|
||||
|
||||
static final String GROUP_PLAINZIP = GROUP_PREFIX + ".plainzip"; //$NON-NLS-1$
|
||||
|
||||
static final String KEY_PREF_LAST_PATCH = "last.patch"; //$NON-NLS-1$
|
||||
|
||||
}
|
||||
Binary file not shown.
@@ -159,8 +159,6 @@ public interface IDesignerCoreService extends IService {
|
||||
|
||||
public Set<ModuleNeeded> getNeededLibrariesForProcess(IProcess process, boolean withChildrens);
|
||||
|
||||
public Set<ModuleNeeded> getNeededLibrariesForProcessBeforeUpdateLog(IProcess process, boolean withChildrens);
|
||||
|
||||
public Set<ModuleNeeded> getNeededModules(INode node, boolean withChildrens);
|
||||
|
||||
public void switchToCurContextsView();
|
||||
@@ -200,4 +198,6 @@ public interface IDesignerCoreService extends IService {
|
||||
|
||||
boolean isNeedContextInJar(IProcess process);
|
||||
|
||||
public String[] getNeedRemoveModulesForLog4j();
|
||||
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.ui</artifactId>
|
||||
|
||||
@@ -74,12 +74,14 @@ import org.eclipse.nebula.widgets.nattable.style.Style;
|
||||
import org.eclipse.nebula.widgets.nattable.tree.SortableTreeComparator;
|
||||
import org.eclipse.nebula.widgets.nattable.tree.TreeLayer;
|
||||
import org.eclipse.nebula.widgets.nattable.tree.config.DefaultTreeLayerConfiguration;
|
||||
import org.eclipse.nebula.widgets.nattable.util.GCFactory;
|
||||
import org.eclipse.nebula.widgets.nattable.util.GUIHelper;
|
||||
import org.eclipse.nebula.widgets.nattable.viewport.ViewportLayer;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.events.MouseEvent;
|
||||
import org.eclipse.swt.events.MouseListener;
|
||||
import org.eclipse.swt.graphics.Font;
|
||||
import org.eclipse.swt.graphics.GC;
|
||||
import org.eclipse.swt.graphics.Point;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.swt.widgets.Control;
|
||||
@@ -482,12 +484,33 @@ public class ContextTreeTable {
|
||||
}
|
||||
}
|
||||
if (!findHide && !findCheck && !findType) {
|
||||
dataLayer.setColumnWidthByPosition(i, averageWidth);
|
||||
int colW = getColumWidth(dataLayer, i, averageWidth);
|
||||
dataLayer.setColumnWidthByPosition(i, colW);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private int getColumWidth(DataLayer dataLayer, int colPos, int avgWidth) {
|
||||
int colWidth = fixedTypeWidth;
|
||||
GC gc = new GCFactory(natTable).createGC();
|
||||
int max = 0;
|
||||
String text = "";
|
||||
for (int i = 0; i < dataLayer.getPreferredRowCount(); i++) {
|
||||
text = dataLayer.getDataValueByPosition(colPos, i).toString();
|
||||
Point size = gc.textExtent(text, SWT.DRAW_MNEMONIC);
|
||||
int temp = size.x;
|
||||
if (temp > max) {
|
||||
max = temp;
|
||||
}
|
||||
}
|
||||
gc.dispose();
|
||||
if (max > colWidth) {
|
||||
max = (int) (max - text.getBytes().length * 1.5);
|
||||
}
|
||||
return colWidth > max ? colWidth : max;
|
||||
}
|
||||
|
||||
private List<Integer> addCustomHideColumnsBehaviour(IContextModelManager modelManager, ColumnGroupModel contextGroupModel,
|
||||
DataLayer dataLayer) {
|
||||
List<Integer> hidePos = new ArrayList<Integer>();
|
||||
|
||||
@@ -1,34 +1,27 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2019 Talend Inc. - www.talend.com
|
||||
//
|
||||
// This source code is available under agreement available at
|
||||
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
|
||||
//
|
||||
// You should have received a copy of the agreement
|
||||
// along with this program; if not, write to Talend SA
|
||||
// 9 rue Pages 92150 Suresnes, France
|
||||
//
|
||||
// ============================================================================
|
||||
package org.talend.core.updatesite;
|
||||
|
||||
/**
|
||||
* DOC hywang class global comment. Detailled comment
|
||||
*/
|
||||
public interface IUpdateSiteBean {
|
||||
|
||||
public String getClassifier();
|
||||
|
||||
public String getGroupID();
|
||||
|
||||
public String getArtifactID();
|
||||
|
||||
public String getVersion();
|
||||
|
||||
public String getPackaging();
|
||||
|
||||
public String getURL();
|
||||
|
||||
public Object getArtifact();
|
||||
|
||||
}
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2019 Talend Inc. - www.talend.com
|
||||
//
|
||||
// This source code is available under agreement available at
|
||||
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
|
||||
//
|
||||
// You should have received a copy of the agreement
|
||||
// along with this program; if not, write to Talend SA
|
||||
// 9 rue Pages 92150 Suresnes, France
|
||||
//
|
||||
// ============================================================================
|
||||
package org.talend.core.ui.services;
|
||||
|
||||
import org.eclipse.jface.preference.PreferencePage;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.talend.core.IService;
|
||||
|
||||
|
||||
/**
|
||||
* DOC hzhao class global comment. Detailled comment
|
||||
*/
|
||||
public interface IHadoopUiService extends IService {
|
||||
|
||||
IPreferenceForm createDynamicDistributionPrefForm(Composite parent, PreferencePage prefPage);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package org.talend.core.ui.services;
|
||||
|
||||
|
||||
public interface IPreferenceForm {
|
||||
|
||||
void setLayoutData(Object layoutData);
|
||||
|
||||
boolean performApply();
|
||||
|
||||
boolean performDefaults();
|
||||
|
||||
boolean isComplete();
|
||||
|
||||
}
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core</artifactId>
|
||||
|
||||
@@ -31,18 +31,30 @@ public enum EConnectionParameterName {
|
||||
DATASOURCE("DataSource"), //$NON-NLS-1$
|
||||
DRIVER_JAR("Driver jar"), //$NON-NLS-1$
|
||||
DRIVER_CLASS("Driver class"), //$NON-NLS-1$
|
||||
LOCAL_SERVICE_NAME("Local Service Name"),
|
||||
LOCAL_SERVICE_NAME("Local Service Name"), //$NON-NLS-1$
|
||||
URL("Url"), //$NON-NLS-1$
|
||||
HTTPS("https"), //$NON-NLS-1$
|
||||
DBPATH("DBPATH"),//$NON-NLS-1$
|
||||
|
||||
// TDQ-17294 msjian: for tSnowflakeInput
|
||||
ACCOUNT("connection.account"), //$NON-NLS-1$
|
||||
WAREHOUSE("connection.warehouse"), //$NON-NLS-1$
|
||||
DB("connection.db"), //$NON-NLS-1$
|
||||
SCHEMA_NAME("connection.schemaName"), //$NON-NLS-1$
|
||||
JDBC_PARAMETER("connection.jdbcParameters"), //$NON-NLS-1$
|
||||
USER_ID("connection.userPassword.userId"), //$NON-NLS-1$
|
||||
USER_PASSWORD("connection.userPassword.password"), //$NON-NLS-1$
|
||||
QUERY("query"), //$NON-NLS-1$
|
||||
// TDQ-17294~
|
||||
|
||||
GENERIC_TABLENAME("tableSelection.tablename"),//$NON-NLS-1$
|
||||
GENERIC_USERNAME("connection.userPassword.userId"),//$NON-NLS-1$
|
||||
GENERIC_PASSWORD("connection.userPassword.password"),//$NON-NLS-1$
|
||||
GENERIC_URL("connection.jdbcUrl"),//$NON-NLS-1$
|
||||
GENERIC_DRIVER_JAR("connection.driverTable"),//$NON-NLS-1$
|
||||
GENERIC_DRIVER_CLASS("connection.driverClass"), //$NON-NLS-1$
|
||||
GENERIC_MAPPING_FILE("mappingFile");
|
||||
GENERIC_MAPPING_FILE("mappingFile"); //$NON-NLS-1$
|
||||
|
||||
|
||||
private String displayName;
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ import org.talend.commons.exception.SystemException;
|
||||
import org.talend.core.IService;
|
||||
import org.talend.core.model.general.Project;
|
||||
import org.talend.core.model.process.INode;
|
||||
import org.talend.core.updatesite.IUpdateSiteBean;
|
||||
import org.talend.core.runtime.maven.MavenArtifact;
|
||||
|
||||
/**
|
||||
* wchen class global comment. Detailled comment
|
||||
@@ -39,7 +39,7 @@ public interface ICoreTisService extends IService {
|
||||
|
||||
public boolean validProject(Project project, boolean flag) throws PersistenceException;
|
||||
|
||||
public List<IUpdateSiteBean> getPatchesInstalled() throws BackingStoreException;
|
||||
public List<MavenArtifact> getInstalledPatchArtifacts() throws BackingStoreException;
|
||||
|
||||
public boolean needRestartAfterUpdate();
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.cwm.mip.edit</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.cwm.mip.editor</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.cwm.mip</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.datatools.xml</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.aether</artifactId>
|
||||
|
||||
@@ -15,6 +15,7 @@ package org.talend.designer.maven.aether.util;
|
||||
import java.io.File;
|
||||
import java.io.PrintWriter;
|
||||
import java.io.StringWriter;
|
||||
import java.nio.file.Files;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
@@ -38,9 +39,6 @@ import org.eclipse.aether.collection.CollectRequest;
|
||||
import org.eclipse.aether.collection.DependencySelector;
|
||||
import org.eclipse.aether.graph.DefaultDependencyNode;
|
||||
import org.eclipse.aether.graph.Exclusion;
|
||||
import org.eclipse.aether.impl.DefaultServiceLocator;
|
||||
import org.eclipse.aether.internal.transport.wagon.PlexusWagonConfigurator;
|
||||
import org.eclipse.aether.internal.transport.wagon.PlexusWagonProvider;
|
||||
import org.eclipse.aether.repository.Authentication;
|
||||
import org.eclipse.aether.repository.LocalRepository;
|
||||
import org.eclipse.aether.repository.RemoteRepository;
|
||||
@@ -49,6 +47,8 @@ import org.eclipse.aether.resolution.ArtifactRequest;
|
||||
import org.eclipse.aether.resolution.ArtifactResult;
|
||||
import org.eclipse.aether.resolution.VersionRangeRequest;
|
||||
import org.eclipse.aether.resolution.VersionRangeResult;
|
||||
import org.eclipse.aether.transfer.MetadataNotFoundException;
|
||||
import org.eclipse.aether.transfer.MetadataTransferException;
|
||||
import org.eclipse.aether.util.artifact.JavaScopes;
|
||||
import org.eclipse.aether.util.graph.selector.AndDependencySelector;
|
||||
import org.eclipse.aether.util.graph.selector.OptionalDependencySelector;
|
||||
@@ -67,6 +67,8 @@ import org.talend.designer.maven.aether.node.DependencyNode;
|
||||
import org.talend.designer.maven.aether.node.ExclusionNode;
|
||||
import org.talend.designer.maven.aether.selector.DynamicDependencySelector;
|
||||
import org.talend.designer.maven.aether.selector.DynamicExclusionDependencySelector;
|
||||
import org.talend.utils.io.FilesUtils;
|
||||
import org.talend.utils.sugars.TypedReturnCode;
|
||||
|
||||
/**
|
||||
* DOC cmeng class global comment. Detailled comment
|
||||
@@ -368,6 +370,99 @@ public class DynamicDistributionAetherUtils {
|
||||
}
|
||||
}
|
||||
|
||||
public static TypedReturnCode checkConnection(String remoteUrl, String username, String password, String groupId,
|
||||
String artifactId, String baseVersion, String topVersion, IDynamicMonitor monitor) throws Exception {
|
||||
TypedReturnCode<VersionRangeResult> tc = new TypedReturnCode<VersionRangeResult>();
|
||||
File tempDirectory = null;
|
||||
try {
|
||||
if (monitor == null) {
|
||||
monitor = new DummyDynamicMonitor();
|
||||
}
|
||||
tempDirectory = Files.createTempDirectory("nexusTemp_").toFile();
|
||||
String localPath = tempDirectory.getPath();
|
||||
RepositorySystem repSystem = MavenLibraryResolverProvider.newRepositorySystemForResolver();
|
||||
RepositorySystemSession repSysSession = newSession(repSystem, localPath, monitor);
|
||||
updateDependencySelector((DefaultRepositorySystemSession) repSysSession, monitor);
|
||||
|
||||
String base = baseVersion;
|
||||
if (base == null || base.isEmpty()) {
|
||||
base = "0"; //$NON-NLS-1$
|
||||
}
|
||||
String range = ":[" + base + ","; //$NON-NLS-1$ //$NON-NLS-2$
|
||||
if (topVersion != null && !topVersion.isEmpty()) {
|
||||
// :[0,1)
|
||||
range = range + topVersion + ")"; //$NON-NLS-1$
|
||||
} else {
|
||||
// :[0,)
|
||||
range = range + ")"; //$NON-NLS-1$
|
||||
}
|
||||
|
||||
Artifact artifact = new DefaultArtifact(groupId + GAV_SEPERATOR + artifactId + range);
|
||||
Builder builder = new RemoteRepository.Builder("central", "default", remoteUrl); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
if (StringUtils.isNotEmpty(username)) {
|
||||
Authentication auth = new AuthenticationBuilder().addUsername(username).addPassword(password).build();
|
||||
builder = builder.setAuthentication(auth);
|
||||
}
|
||||
RemoteRepository central = builder.build();
|
||||
central = new RemoteRepository.Builder(central).setProxy(new TalendAetherProxySelector().getProxy(central)).build();
|
||||
|
||||
VersionRangeRequest verRangeRequest = new VersionRangeRequest();
|
||||
verRangeRequest.addRepository(central);
|
||||
verRangeRequest.setArtifact(artifact);
|
||||
|
||||
checkCancelOrNot(monitor);
|
||||
VersionRangeResult rangeResult = repSystem.resolveVersionRange(repSysSession, verRangeRequest);
|
||||
if (rangeResult == null) {
|
||||
tc.setOk(false);
|
||||
return tc;
|
||||
} else {
|
||||
// have version ragne >> success
|
||||
if (rangeResult.getHighestVersion() != null) {
|
||||
tc.setOk(true);
|
||||
tc.setObject(rangeResult);
|
||||
return tc;
|
||||
}
|
||||
// no version
|
||||
if (rangeResult.getExceptions() == null || rangeResult.getExceptions().size() < 1) {
|
||||
tc.setOk(false);
|
||||
return tc;
|
||||
}
|
||||
// 1. remoteRepository exception is MetadataNotFoundException: connected => failed
|
||||
for (Exception e : rangeResult.getExceptions()) {
|
||||
if (e instanceof MetadataNotFoundException
|
||||
&& central.equals(((MetadataNotFoundException) e).getRepository())) {
|
||||
tc.setOk(false);
|
||||
tc.setMessage(e.getMessage());
|
||||
ExceptionHandler.process(e);
|
||||
return tc;
|
||||
}
|
||||
}
|
||||
// 2. remoteRepository exception is MetadataTransferException: connect failed
|
||||
for (Exception e : rangeResult.getExceptions()) {
|
||||
if (e instanceof MetadataTransferException
|
||||
&& central.equals(((MetadataTransferException) e).getRepository())) {
|
||||
tc.setOk(false);
|
||||
tc.setMessage(e.getCause().getMessage());
|
||||
ExceptionHandler.process(e);
|
||||
return tc;
|
||||
}
|
||||
}
|
||||
// 3. no remoteRepository exception, throw first exception, log other exception
|
||||
tc.setOk(false);
|
||||
tc.setMessage(rangeResult.getExceptions().get(0).getMessage());
|
||||
for (Exception e : rangeResult.getExceptions()) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
return tc;
|
||||
}
|
||||
} finally {
|
||||
if (tempDirectory != null) {
|
||||
FilesUtils.deleteFolder(tempDirectory, true);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static DependencyNode convert(org.eclipse.aether.graph.DependencyNode node, RemoteRepository remoteRepository)
|
||||
throws Exception {
|
||||
// List<RemoteRepository> repositories = node.getRepositories();
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.tos</artifactId>
|
||||
@@ -82,18 +82,24 @@
|
||||
<version>${project.version}</version>
|
||||
<type>pom</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>karaf-maven-plugin-4-2-4-tos</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>pom</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>talend-ci-osgihelper-maven-plugin-tos</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>pom</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>studio-maven-repository-zip</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>pom</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>karaf-maven-plugin-4-2-4-tos</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>pom</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<profiles>
|
||||
<profile>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>studio-maven-repository-tos</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>build-helper-maven-plugin-3-0-0-tos</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>studio-maven-repository-tos</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>karaf-maven-plugin-4-2-4-tos</artifactId>
|
||||
@@ -31,6 +31,11 @@
|
||||
<version>5.0.2.RELEASE</version>
|
||||
<type>pom</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.tukaani</groupId>
|
||||
<artifactId>xz</artifactId>
|
||||
<version>1.6</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<plugins>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>studio-maven-repository-tos</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>maven-bundle-plugin-2-3-7-tos</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>studio-maven-repository-tos</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M6</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>maven-bundle-plugin-2-5-3-tos</artifactId>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user