Compare commits

..

1 Commits

Author SHA1 Message Date
hwang
8a5b6311b6 TDI-35190:Cannot import job with test case 2016-02-23 10:41:50 +08:00
512 changed files with 7339 additions and 16498 deletions

View File

@@ -1,13 +1,13 @@
<?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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.babel.all.tos.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.babel.all.tos.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.common.ui.runtime.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.common.ui.runtime.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.runtime.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.runtime.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.ui.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.ui.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.repository.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.repository.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.runtime.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.runtime.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.ui.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.ui.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.cwm.mip.edit.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.cwm.mip.edit.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.cwm.mip.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.cwm.mip.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.maven.ui.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.maven.ui.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.help.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.help.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.helpers.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.helpers.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.librariesmanager.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.librariesmanager.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.librariesmanager.ui.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.librariesmanager.ui.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.metadata.managment.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.metadata.managment.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.metadata.managment.ui.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.metadata.managment.ui.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.migrationTool.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.migrationTool.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.edit.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.edit.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.migration.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.migration.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.presentation.onboarding.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.presentation.onboarding.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.registration.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.registration.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.items.importexport.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.items.importexport.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.localprovider.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.localprovider.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.mdm.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.mdm.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.metadata.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.metadata.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.view.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.view.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.resources.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.resources.nl</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -109,25 +109,4 @@
version="0.0.0"
unpack="false"/>
<plugin
id="jackson-core-asl"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="jackson-mapper-asl"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xerces"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.fragment.jars.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.fragment.jars.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.help.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.help.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.jdt.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.jdt.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

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

View File

@@ -202,12 +202,4 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.slf4j.impl.log4j12"
download-size="0"
install-size="0"
version="1.7.2.v20131105-2200"
fragment="true"
unpack="false"/>
</feature>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.m2e.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.m2e.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.migration.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.migration.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -1,13 +1,13 @@
<?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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.platform.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.platform.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.update.p2.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.update.p2.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.updates.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.updates.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -114,38 +114,4 @@
version="0.0.0"
unpack="false"/>
<plugin
id="jackson-core-asl"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="jackson-mapper-asl"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.servicemix.bundles.avro"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.thoughtworks.paranamer"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.compress"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.utils.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.utils.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>

View File

@@ -1,27 +1,27 @@
<?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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.common.ui.runtime</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.common.ui.runtime</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -10,8 +10,7 @@ Require-Bundle: org.apache.log4j;visibility:=reexport,
org.apache.commons.lang;visibility:=reexport,
org.eclipse.core.runtime,
org.eclipse.emf.ecore.xmi,
org.talend.libraries.apache,
org.apache.xerces
org.talend.libraries.apache
Export-Package: org.talend.commons,
org.talend.commons.exception,
org.talend.commons.i18n,
@@ -53,4 +52,3 @@ Export-Package: org.talend.commons,
Bundle-ClassPath: .,
fakejdbc_driver.jar
Bundle-Vendor: .Talend SA.
Bundle-RequiredExecutionEnvironment: JavaSE-1.7

View File

@@ -1,27 +1,27 @@
<?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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.runtime</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.runtime</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.talend</groupId>
<artifactId>org.talend.tos</artifactId>
<version>6.2.0</version>
<version>6.2.0-SNAPSHOT</version>
<relativePath>../pom_server.xml</relativePath>
</parent>

View File

@@ -24,9 +24,4 @@ public interface IComponentConstants {
public static final String JOBLET_NAME_CHANGED = "joblet name changed"; //$NON-NLS-1$
public static final String JOBLET_SCHEMA_CHANGED = "joblet schema changed"; //$NON-NLS-1$
public static final String COMPONENT_PROPERTIES_TAG = "component.json.serialized"; //$NON-NLS-1$
public static final String COMPONENT_SCHEMA_TAG = "component.property.schema"; //$NON-NLS-1$
}

View File

@@ -39,6 +39,70 @@ public class NetworkUtil {
private static final String TALEND_DISABLE_INTERNET = "talend.disable.internet";//$NON-NLS-1$
private final static Set<String> getMacAddressList() throws IOException {
final Set<String> macAddressList = new HashSet<String>();
final String os = System.getProperty("os.name"); //$NON-NLS-1$
final String[] command;
if (os.startsWith("Windows")) { //$NON-NLS-1$
command = windowsCommand;
} else if (os.startsWith("Linux")) { //$NON-NLS-1$
command = linuxCommand;
} else {
throw new IOException("Unknown operating system: " + os); //$NON-NLS-1$
}
final Process process = Runtime.getRuntime().exec(command);
// Discard the stderr
new Thread() {
@Override
public void run() {
try {
InputStream errorStream = process.getErrorStream();
while (errorStream.read() != -1) {
}
errorStream.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}.start();
// Extract the MAC addresses from stdout
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
for (String line = null; (line = reader.readLine()) != null;) {
Matcher matcher = macPattern.matcher(line);
if (matcher.matches()) {
// macAddressList.add(matcher.group(1));
macAddressList.add(matcher.group(1).replaceAll("[-:]", "")); //$NON-NLS-1$ //$NON-NLS-2$
}
}
reader.close();
return macAddressList;
}
/**
* Note should rename as "getFullMacAddresses" later since it takes in fact the concatenation of all mac address.
*
* @return
*/
public static String getMacAddress() {
try {
Set<String> addressList = getMacAddressList();
StringBuffer sb = new StringBuffer();
// remove empty mac address
addressList.remove("0000000000E0"); //$NON-NLS-1$
for (String curMacAddress : addressList) {
sb.append(curMacAddress);
}
return sb.toString();
} catch (IOException e) {
return null;
}
}
public static boolean isNetworkValid() {
String disableInternet = System.getProperty(TALEND_DISABLE_INTERNET);
if ("true".equals(disableInternet)) { //$NON-NLS-1$
@@ -79,4 +143,12 @@ public class NetworkUtil {
return null;
}
public final static void main(String[] args) {
try {
System.out.println(" MAC Address: " + getMacAddress()); //$NON-NLS-1$
} catch (Throwable t) {
t.printStackTrace();
}
}
}

View File

@@ -1,12 +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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.ui</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.ui</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

View File

@@ -46,7 +46,7 @@ public class UtilsButton {
public UtilsButton(Composite parent, String string, int width, int height) {
parent.setLayout(new RowLayout());
createButton(parent, string, false);
button.computeSize(SWT.DEFAULT, SWT.DEFAULT);
button.setLayoutData(new RowData(width, height));
}
/**

View File

@@ -44,4 +44,3 @@ Bundle-Activator: org.talend.core.repository.CoreRepositoryPlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Vendor: .Talend SA.
Bundle-RequiredExecutionEnvironment: JavaSE-1.7

View File

@@ -17,7 +17,6 @@
<extension-point id="repository_review_filter" name="repository_review_filter" schema="schema/repository_review_filter.exsd"/>
<extension-point id="repository_context" name="Repository_context" schema="schema/repository_context.exsd"/>
<extension-point id="document_generator" name="document_generator" schema="schema/document_generator.exsd"/>
<extension-point id="git_content_service" name="git_content_service" schema="schema/git_content_service.exsd"/>
<extension
point="org.talend.core.runtime.service">

View File

@@ -1,27 +1,27 @@
<?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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.repository</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.repository</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -1,102 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
<schema targetNamespace="org.talend.core.repository" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
<meta.schema plugin="org.talend.core.repository" id="git_content_service" name="git_content_service"/>
</appinfo>
<documentation>
[Enter description of this extension point.]
</documentation>
</annotation>
<element name="extension">
<annotation>
<appinfo>
<meta.element />
</appinfo>
</annotation>
<complexType>
<sequence>
<element ref="service" minOccurs="1" maxOccurs="unbounded"/>
</sequence>
<attribute name="point" type="string" use="required">
<annotation>
<documentation>
</documentation>
</annotation>
</attribute>
<attribute name="id" type="string">
<annotation>
<documentation>
</documentation>
</annotation>
</attribute>
<attribute name="name" type="string">
<annotation>
<documentation>
</documentation>
<appinfo>
<meta.attribute translatable="true"/>
</appinfo>
</annotation>
</attribute>
</complexType>
</element>
<element name="service">
<complexType>
<attribute name="class" type="string">
<annotation>
<documentation>
</documentation>
<appinfo>
<meta.attribute kind="java" basedOn=":org.talend.core.repository.services.IGitRepositoryService"/>
</appinfo>
</annotation>
</attribute>
</complexType>
</element>
<annotation>
<appinfo>
<meta.section type="since"/>
</appinfo>
<documentation>
[Enter the first release in which this extension point appears.]
</documentation>
</annotation>
<annotation>
<appinfo>
<meta.section type="examples"/>
</appinfo>
<documentation>
[Enter extension point usage example here.]
</documentation>
</annotation>
<annotation>
<appinfo>
<meta.section type="apiinfo"/>
</appinfo>
<documentation>
[Enter API information here.]
</documentation>
</annotation>
<annotation>
<appinfo>
<meta.section type="implementation"/>
</appinfo>
<documentation>
[Enter information about supplied implementation of this extension point.]
</documentation>
</annotation>
</schema>

View File

@@ -163,10 +163,6 @@ ProjectRepositoryNode.sapFunctions.inputSchema=Input
ProjectRepositoryNode.sapFunctions.outputSchema=Output
ProjectRepositoryNode.sapIDocs=SAP iDocs
ProjectRepositoryNode.sapTables=SAP Tables
ProjectRepositoryNode.sapBWDataSource=SAP DataSource
ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
ProjectRepositoryNode.sapBWInfoObject=SAP InfoObject
RepositoryDropAdapter_copyingItems=Copying items...
RepositoryDropAdapter_errorMsg=This directory contains the locked item,it can not be moved now

View File

@@ -14,7 +14,6 @@ package org.talend.core.repository.model;
import java.util.List;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.SubMonitor;
import org.talend.commons.exception.BusinessException;
@@ -39,7 +38,6 @@ import org.talend.core.model.repository.IRepositoryWorkUnitListener;
import org.talend.core.model.repository.LockInfo;
import org.talend.core.repository.utils.XmiResourceManager;
import org.talend.repository.RepositoryWorkUnit;
import org.talend.utils.json.JSONArray;
/**
* Defines all methods that a repository provider plug-in must provides to client.<br/>
@@ -93,8 +91,6 @@ public interface IRepositoryFactory {
public Project[] readProject() throws PersistenceException, BusinessException;
public Project[] readProject(boolean local, boolean reuseExisting, IProject... eclipseProjects) throws PersistenceException;
// for export project ,no need to unload resource when read projects
public Project[] readProject(boolean unloadResource) throws PersistenceException, BusinessException;
@@ -219,8 +215,6 @@ public interface IRepositoryFactory {
*/
public void restoreObject(IRepositoryViewObject objToRestore, IPath path) throws PersistenceException;
public void restoreObject(Project project, IRepositoryViewObject objToRestore, IPath path) throws PersistenceException;
public void moveObject(IRepositoryViewObject objToMove, IPath newPath) throws PersistenceException;
public void moveObjectMulti(IRepositoryViewObject[] objToMove, IPath newPath) throws PersistenceException;
@@ -420,8 +414,4 @@ public interface IRepositoryFactory {
public void setStorage(String storage);
public String getStorage();
public JSONArray getAllRemoteLocks();
public void loadProjectAndSetContext(IProject eclipseProject) throws PersistenceException;
}

View File

@@ -39,6 +39,7 @@ import org.talend.commons.utils.data.container.Container;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.PluginChecker;
import org.talend.core.database.EDatabaseTypeName;
import org.talend.core.model.genhtml.IHTMLDocConstants;
import org.talend.core.model.metadata.MetadataManager;
import org.talend.core.model.metadata.builder.connection.Connection;
import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
@@ -46,7 +47,6 @@ import org.talend.core.model.metadata.builder.connection.MetadataColumn;
import org.talend.core.model.metadata.builder.connection.MetadataTable;
import org.talend.core.model.metadata.builder.connection.QueriesConnection;
import org.talend.core.model.metadata.builder.connection.Query;
import org.talend.core.model.metadata.builder.connection.SAPBWTable;
import org.talend.core.model.metadata.builder.connection.SAPConnection;
import org.talend.core.model.metadata.builder.connection.SAPFunctionUnit;
import org.talend.core.model.metadata.builder.connection.SAPIDocUnit;
@@ -92,9 +92,9 @@ import org.talend.core.ui.ICDCProviderService;
import org.talend.core.ui.ITestContainerProviderService;
import org.talend.core.ui.branding.IBrandingService;
import org.talend.cwm.helper.ConnectionHelper;
import org.talend.cwm.helper.SAPBWTableHelper;
import org.talend.cwm.helper.SubItemHelper;
import org.talend.cwm.helper.TableHelper;
import org.talend.designer.core.ICamelDesignerCoreService;
import org.talend.designer.core.IDesignerCoreService;
import org.talend.repository.ProjectManager;
import org.talend.repository.model.BinRepositoryNode;
@@ -980,6 +980,51 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
return false;
}
@SuppressWarnings("rawtypes")
private void convertDocumentation(org.talend.core.model.general.Project newProject, Container generatedContainer,
RepositoryNode parent, ERepositoryObjectType type) {
// for folder Documentation/generated
// RepositoryNode generatedFolder = getRootRepositoryNode(ERepositoryObjectType.GENERATED);
// for folder Documentation/generated/jobs
convertDocumentation(newProject, generatedContainer, parent, type, ERepositoryObjectType.JOBS,
ERepositoryObjectType.JOB_DOC);
// for folder Documentation/generated/joblets
convertDocumentation(newProject, generatedContainer, parent, type, ERepositoryObjectType.JOBLETS,
ERepositoryObjectType.JOBLET_DOC);
if (GlobalServiceRegister.getDefault().isServiceRegistered(ICamelDesignerCoreService.class)) {
ICamelDesignerCoreService service = (ICamelDesignerCoreService) GlobalServiceRegister.getDefault().getService(
ICamelDesignerCoreService.class);
if (service.getRouteDocsType() != null && service.getRouteDocType() != null) {
convertDocumentation(newProject, generatedContainer, parent, type, service.getRouteDocsType(),
service.getRouteDocType());
}
}
}
@SuppressWarnings("rawtypes")
private void convertDocumentation(org.talend.core.model.general.Project newProject, Container generatedContainer,
RepositoryNode parent, ERepositoryObjectType type, ERepositoryObjectType parentDocType, ERepositoryObjectType docType) {
RepositoryNode docsFolder = getRootRepositoryNode(parentDocType);
Container docsNode = null;
for (Object object : generatedContainer.getSubContainer()) {
if (((Container) object).getLabel().equalsIgnoreCase(parentDocType.name().toLowerCase())) {
docsNode = (Container) object;
break;
}
}
// get the files under generated/nodes.
if (docsNode != null) {
convert(newProject, docsNode, docsFolder, docType);
}
}
private RepositoryNode getSQLPatternNode(String parentLabel, String label) {
if (getMergeRefProject()) {
List<IRepositoryNode> sqlChildren = getRootRepositoryNode(ERepositoryObjectType.SQLPATTERNS).getChildren();
@@ -1048,7 +1093,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
Folder oFolder = new Folder((Property) container.getProperty(), type);
boolean found = false;
// add for bug TDI-26084, whether or not hide folders under job_doc/joblet_doc.
if (type.equals(ERepositoryObjectType.JOB_DOC) || type.equals(ERepositoryObjectType.JOBLET_DOC)) {
if (ERepositoryObjectType.JOB_DOC.equals(type) || ERepositoryObjectType.JOBLET_DOC.equals(type)) {
for (FolderItem delFolder : delFolderItems) {
String parentName = ((FolderItem) delFolder.getParent()).getProperty().getLabel();
String oFolderPath = oFolder.getPath();
@@ -1081,6 +1126,19 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
if (label.equals("bin") || label.startsWith(".")) { //$NON-NLS-1$ //$NON-NLS-2$
continue;
}
// currently, only process the docs for job, joblet and route.
if (type.equals(ERepositoryObjectType.JOB_DOC) || type.equals(ERepositoryObjectType.JOBLET_DOC)
|| type.equals(ERepositoryObjectType.JOBS) || type.equals(ERepositoryObjectType.JOBLETS)
|| type.equals(ERepositoryObjectType.valueOf("ROUTE_DOCS"))//$NON-NLS-1$
|| type.equals(ERepositoryObjectType.valueOf("ROUTE_DOC"))) {//$NON-NLS-1$
boolean isJobDocRootFolder = ((label.indexOf("_") != -1) && (label.indexOf(".") != -1)); //$NON-NLS-1$ //$NON-NLS-2$
boolean isPicFolderName = label.equals(IHTMLDocConstants.PIC_FOLDER_NAME);
// Do not show job documentation root folder and Foder "pictures" on the repository view.
if (isJobDocRootFolder || isPicFolderName) {
continue;
}
}
// for system folder
if (RepositoryConstants.SYSTEM_DIRECTORY.equals(label)) {
if (getMergeRefProject()) {
@@ -1108,13 +1166,10 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
parent.getChildren().add(folder);
}
} else
// ERepositoryObjectType.GENERATED
if (type.equals(ERepositoryObjectType.DOCUMENTATION) && label.equalsIgnoreCase("generated")) {//$NON-NLS-1$
// if (PluginChecker.isDocumentationPluginLoaded()) {
// use CNF content provider instead
// convertDocumentation(newProject, container, parent, type);
// }
} else if (ERepositoryObjectType.GENERATED.name().equalsIgnoreCase(label)) {
if (PluginChecker.isDocumentationPluginLoaded()) {
convertDocumentation(newProject, container, parent, type);
}
continue;
} else {
if (getMergeRefProject()) {
@@ -1407,12 +1462,6 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
if (vo != null) {
String schema = vo.getId();
schema = schema + " - " + metadataTable.getLabel(); //$NON-NLS-1$
if (metadataTable instanceof SAPBWTable) {
String innerIOType = ((SAPBWTable) metadataTable).getInnerIOType();
if (innerIOType != null) {
schema = schema + " - " + innerIOType; //$NON-NLS-1$
}
}
List<IRepositoryViewObject> objs = getValidationRuleObjsFromSchema(validationRules, schema);
if (objs.size() > 0) {
int num = objs.size();
@@ -1583,18 +1632,6 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
iDocNode.setChildrenObjectType(ERepositoryObjectType.METADATA_SAP_IDOC);
node.getChildren().add(iDocNode);
createSAPIDocNodes(repObj, metadataConnection, iDocNode);
// 4. BW DataSource:
createSAPBWDataSourceNodes(repObj, metadataConnection, node, validationRules);
// 5. BW DataStoreObject:
createSAPBWDataStoreObjectNodes(repObj, metadataConnection, node, validationRules);
// 6. BW InfoCube:
createSAPBWInfoCubeNodes(repObj, metadataConnection, node, validationRules);
// 7. BW InfoObject:
createSAPBWInfoObjectNodes(repObj, metadataConnection, node, validationRules);
} else if (metadataConnection instanceof SalesforceSchemaConnection) {
createSalesforceModuleNodes(repObj, metadataConnection, node, validationRules);
} else {
@@ -1621,66 +1658,6 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
}
private void createSAPBWDataSourceNodes(IRepositoryViewObject repObj, Connection metadataConnection, RepositoryNode node,
List<IRepositoryViewObject> validationRules) {
StableRepositoryNode container = new StableRepositoryNode(node,
Messages.getString("ProjectRepositoryNode.sapBWDataSource"), ECoreImage.FOLDER_CLOSE_ICON); //$NON-NLS-1$
container.setChildrenObjectType(ERepositoryObjectType.METADATA_CON_TABLE);
container.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.METADATA_SAP_BW_DATASOURCE);
node.getChildren().add(container);
EList<SAPBWTable> datasources = ((SAPConnection) metadataConnection).getBWDataSources();
EList tables = new BasicEList();
tables.addAll(datasources);
createTables(container, repObj, tables, ERepositoryObjectType.METADATA_CON_TABLE, validationRules);
}
private void createSAPBWDataStoreObjectNodes(IRepositoryViewObject repObj, Connection metadataConnection,
RepositoryNode node, List<IRepositoryViewObject> validationRules) {
StableRepositoryNode container = new StableRepositoryNode(node,
Messages.getString("ProjectRepositoryNode.sapBWDataStoreObject"), ECoreImage.FOLDER_CLOSE_ICON); //$NON-NLS-1$
container.setChildrenObjectType(ERepositoryObjectType.METADATA_CON_TABLE);
container.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.METADATA_SAP_BW_DATASTOREOBJECT);
node.getChildren().add(container);
EList<SAPBWTable> dataStoreObjects = ((SAPConnection) metadataConnection).getBWDataStoreObjects();
EList tables = new BasicEList();
tables.addAll(dataStoreObjects);
createTables(container, repObj, tables, ERepositoryObjectType.METADATA_CON_TABLE, validationRules);
}
private void createSAPBWInfoCubeNodes(IRepositoryViewObject repObj, Connection metadataConnection, RepositoryNode node,
List<IRepositoryViewObject> validationRules) {
StableRepositoryNode container = new StableRepositoryNode(node,
Messages.getString("ProjectRepositoryNode.sapBWInfoCube"), ECoreImage.FOLDER_CLOSE_ICON); //$NON-NLS-1$
container.setChildrenObjectType(ERepositoryObjectType.METADATA_CON_TABLE);
container.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.METADATA_SAP_BW_INFOCUBE);
node.getChildren().add(container);
EList<SAPBWTable> infoCubes = ((SAPConnection) metadataConnection).getBWInfoCubes();
EList tables = new BasicEList();
tables.addAll(infoCubes);
createTables(container, repObj, tables, ERepositoryObjectType.METADATA_CON_TABLE, validationRules);
}
private void createSAPBWInfoObjectNodes(IRepositoryViewObject repObj, Connection metadataConnection, RepositoryNode node,
List<IRepositoryViewObject> validationRules) {
StableRepositoryNode container = new StableRepositoryNode(node,
Messages.getString("ProjectRepositoryNode.sapBWInfoObject"), ECoreImage.FOLDER_CLOSE_ICON); //$NON-NLS-1$
container.setChildrenObjectType(ERepositoryObjectType.METADATA_CON_TABLE);
container.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.METADATA_SAP_BW_INFOOBJECT);
node.getChildren().add(container);
EList<SAPBWTable> infoObjects = ((SAPConnection) metadataConnection).getBWInfoObjects();
EList<SAPBWTable> tables = new BasicEList<SAPBWTable>();
for (SAPBWTable bwTable : infoObjects) {
if (!SAPBWTableHelper.IO_INNERTYPE_BASIC.equals(bwTable.getInnerIOType())) {
tables.add(bwTable);
}
}
createTables(container, repObj, tables, ERepositoryObjectType.METADATA_CON_TABLE, validationRules);
}
private void createSalesforceModuleNodes(IRepositoryViewObject rebObj, Connection metadataConnection,
RepositoryNode connectionNode, List<IRepositoryViewObject> validationRules) {
EList modules = ((SalesforceSchemaConnection) metadataConnection).getModules();

View File

@@ -126,7 +126,6 @@ import org.talend.repository.documentation.ERepositoryActionName;
import org.talend.repository.model.IProxyRepositoryFactory;
import org.talend.repository.model.RepositoryConstants;
import org.talend.utils.io.FilesUtils;
import org.talend.utils.json.JSONArray;
import orgomg.cwm.objectmodel.core.ModelElement;
/**
@@ -252,11 +251,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
return this.repositoryFactoryFromProvider;
}
@Override
public Object getXmiResourceManager() {
return getRepositoryFactoryFromProvider().getResourceManager();
}
/*
* (non-Javadoc)
*
@@ -532,7 +526,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
@Override
public synchronized void deleteFolder(Project project, ERepositoryObjectType type, IPath path) throws PersistenceException {
deleteFolder(project, type, path, false);
deleteFolder(projectManager.getCurrentProject(), type, path, false);
}
@Override
@@ -683,17 +677,9 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
@Override
public void deleteObjectLogical(Project project, IRepositoryViewObject objToDelete) throws PersistenceException,
BusinessException {
deleteObjectLogical(project, objToDelete, true);
}
@Override
public void deleteObjectLogical(Project project, IRepositoryViewObject objToDelete, boolean needCheckAvailability)
throws PersistenceException, BusinessException {
// RepositoryViewObject is dynamic, so force to use in all case the RepositoryObject with fixed object.
IRepositoryViewObject object = new RepositoryObject(objToDelete.getProperty());
if (needCheckAvailability) {
checkAvailability(object);
}
checkAvailability(object);
this.repositoryFactoryFromProvider.deleteObjectLogical(project, object);
// unlock(objToDelete);
// i18n
@@ -818,14 +804,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
if (ProxyRepositoryFactory.getInstance().isUserReadOnlyOnCurrentProject()) {
throw new BusinessException(Messages.getString("ProxyRepositoryFactory.bussinessException.itemNonModifiable")); //$NON-NLS-1$
}
restoreObject(ProjectManager.getInstance().getCurrentProject(), objToRestore, path);
}
@Override
public void restoreObject(Project project, IRepositoryViewObject objToRestore, IPath path) throws PersistenceException,
BusinessException {
this.repositoryFactoryFromProvider.restoreObject(project, objToRestore, path);
this.repositoryFactoryFromProvider.restoreObject(objToRestore, path);
unlock(objToRestore);
// i18n
// log.debug("Restoration [" + objToRestore + "] by " + getRepositoryContext().getUser() + " to \"/" + path +
@@ -1499,10 +1478,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
this.repositoryFactoryFromProvider.initialize();
}
public void loadProjectAndSetContext(IProject eclipseProject) throws PersistenceException {
this.repositoryFactoryFromProvider.loadProjectAndSetContext(eclipseProject);
}
/**
* DOC smallet Comment method "emptyTempFolder".
*
@@ -2047,7 +2022,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
this.repositoryFactoryFromProvider.executeRepositoryWorkUnit(workUnit);
}
@Override
public void unloadResources(Property property) throws PersistenceException {
repositoryFactoryFromProvider.unloadResources(property);
}
@@ -2253,8 +2227,4 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
}
}
public JSONArray getAllRemoteLocks() {
return repositoryFactoryFromProvider.getAllRemoteLocks();
}
}

View File

@@ -15,9 +15,7 @@ package org.talend.core.repository.model.listeners;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import org.talend.core.model.general.Project;
import org.talend.core.model.repository.IRepositoryObject;
import org.talend.repository.ProjectManager;
import org.talend.repository.documentation.ERepositoryActionName;
/**
@@ -52,22 +50,4 @@ public abstract class AbstractJobDeleteListener implements PropertyChangeListene
public abstract void execute(IRepositoryObject object, int deleteType);
protected Project getProject(IRepositoryObject repositoryObject) {
String projectLabel = repositoryObject.getProjectLabel();
Project currentProject = ProjectManager.getInstance().getCurrentProject();
if (currentProject.getTechnicalLabel().equalsIgnoreCase(projectLabel)) {
return currentProject;
}
{
/**
* Attention!!<br>
* Can't use the workspace version, since reference project may be different branch with master
*/
// Project project = ProjectManager.getInstance().getProjectFromProjectLabel(projectLabel);
}
org.talend.core.model.properties.Project emfProject = ProjectManager.getInstance()
.getProject(repositoryObject.getProperty());
Project project = new Project(emfProject);
return project;
}
}

View File

@@ -1,49 +0,0 @@
// ============================================================================
//
// Copyright (C) 2006-2015 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.model.provider;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.core.repository.services.IGitContentService;
public class GitContentServiceProviderManager {
public static IGitContentService getGitContentService() {
IGitContentService service = null;
IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint("org.talend.core.repository.git_content_service"); //$NON-NLS-1$
if (extensionPoint != null) {
IExtension[] extensions = extensionPoint.getExtensions();
for (IExtension extension : extensions) {
IConfigurationElement[] configurationElements = extension.getConfigurationElements();
for (IConfigurationElement configurationElement : configurationElements) {
try {
Object object = configurationElement.createExecutableExtension("class"); //$NON-NLS-1$
if (object instanceof IGitContentService) {
service = (IGitContentService) object;
break;
}
} catch (CoreException e) {
ExceptionHandler.process(e);
}
}
}
}
return service;
}
}

View File

@@ -27,8 +27,6 @@ import org.talend.core.model.metadata.builder.connection.AbstractMetadataObject;
import org.talend.core.model.metadata.builder.connection.Concept;
import org.talend.core.model.metadata.builder.connection.Connection;
import org.talend.core.model.metadata.builder.connection.MDMConnection;
import org.talend.core.model.metadata.builder.connection.SAPBWTable;
import org.talend.core.model.metadata.builder.connection.SAPConnection;
import org.talend.core.model.metadata.builder.connection.SAPFunctionUnit;
import org.talend.core.model.metadata.builder.connection.SalesforceModuleUnit;
import org.talend.core.model.properties.ConnectionItem;
@@ -40,7 +38,6 @@ import org.talend.core.model.repository.IRepositoryViewObject;
import org.talend.core.model.repository.ISubRepositoryObject;
import org.talend.core.runtime.services.IGenericWizardService;
import org.talend.cwm.helper.ConnectionHelper;
import org.talend.cwm.helper.SAPBWTableHelper;
import org.talend.cwm.helper.SubItemHelper;
import org.talend.cwm.helper.SwitchHelpers;
import org.talend.cwm.relational.TdTable;
@@ -124,12 +121,6 @@ public class MetadataTableRepositoryObject extends MetadataTable implements ISub
moduleUnit.getTables().remove(table);
return;
}
if (table.eContainer() instanceof SAPConnection && table instanceof SAPBWTable) {
SAPBWTableHelper.removeBWTable((Connection) table.eContainer(), ((SAPBWTable) table).getModelType(),
(SAPBWTable) table);
}
if (table.getNamespace() instanceof Package) {
Package pkg = (Package) table.getNamespace();
if (pkg.getOwnedElement().contains(table)) {
@@ -193,10 +184,6 @@ public class MetadataTableRepositoryObject extends MetadataTable implements ISub
} else if (table.eContainer() instanceof SAPFunctionUnit) {
SAPFunctionUnit funUnit = (SAPFunctionUnit) table.eContainer();
tables = ConnectionHelper.getTables(connection, funUnit);
} else if (table instanceof SAPBWTable) {
String bwTableType = ((SAPBWTable) table).getModelType();
String innerIOType = ((SAPBWTable) table).getInnerIOType();
tables = SAPBWTableHelper.getBWTables(connection, bwTableType, innerIOType, true);
} else {
tables = ConnectionHelper.getTables(connection);
}

View File

@@ -20,7 +20,6 @@ import java.util.List;
import java.util.Map;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
@@ -76,11 +75,6 @@ public class RecycleBinManager {
projectRecyclebins.clear();
}
public void clearCache(Project project) {
String projectTechnicalLabel = project.getTechnicalLabel();
projectRecyclebins.remove(projectTechnicalLabel);
}
public void clearIndex(Project project) {
loadRecycleBin(project);
projectRecyclebins.get(project.getTechnicalLabel()).getDeletedItems().clear();
@@ -94,15 +88,8 @@ public class RecycleBinManager {
List<TalendItem> notDeletedItems = new ArrayList<TalendItem>();
for (TalendItem deletedItem : deletedItems) {
try {
final ERepositoryObjectType type = ERepositoryObjectType.getType(deletedItem.getType());
// ignore the generated doc in recycle bin
if (type != null
&& (type.equals(ERepositoryObjectType.JOB_DOC) || type.equals(ERepositoryObjectType.JOBLET_DOC) || type
.equals(ERepositoryObjectType.valueOf("ROUTE_DOC")))) { //$NON-NLS-1$
continue;
}
IRepositoryViewObject object = ProxyRepositoryFactory.getInstance().getLastVersion(project, deletedItem.getId(),
deletedItem.getPath(), type);
deletedItem.getPath(), ERepositoryObjectType.getType(deletedItem.getType()));
if (object == null) {
object = ProxyRepositoryFactory.getInstance().getLastVersion(project, deletedItem.getId());
}
@@ -177,11 +164,6 @@ public class RecycleBinManager {
}
}
public RecycleBin getRecycleBin(Project project) {
loadRecycleBin(project);
return projectRecyclebins.get(project.getTechnicalLabel());
}
private void loadRecycleBin(Project project) {
if (projectRecyclebins.get(project.getTechnicalLabel()) != null) {
// already loaded, nothing to do. Don't do any force reload
@@ -204,16 +186,6 @@ public class RecycleBinManager {
}
}
public RecycleBin loadRecycleBin(IPath recycleBinIndexPath) throws Exception {
Resource resource = createRecycleBinResource(recycleBinIndexPath);
resource.load(null);
return loadRecycleBin(resource);
}
public RecycleBin loadRecycleBin(Resource resource) {
return (RecycleBin) EcoreUtil.getObjectByType(resource.getContents(), RecycleBinPackage.eINSTANCE.getRecycleBin());
}
public void saveRecycleBin(Project project) {
if (projectRecyclebins.get(project.getTechnicalLabel()) == null) {
loadRecycleBin(project);
@@ -247,12 +219,7 @@ public class RecycleBinManager {
private Resource createRecycleBinResource(Project project) {
IProject eclipseProject = ProjectManager.getInstance().getResourceProject(project.getEmfProject());
return createRecycleBinResource(eclipseProject.getFullPath().append(TALEND_RECYCLE_BIN_INDEX));
}
public Resource createRecycleBinResource(IPath recycleBinIndexPath) {
URI uri = URIHelper.convert(recycleBinIndexPath);
URI uri = URIHelper.convert(eclipseProject.getFullPath().append(TALEND_RECYCLE_BIN_INDEX));
XMLResourceFactoryImpl resourceFact = new XMLResourceFactoryImpl();
XMLResource resource = (XMLResource) resourceFact.createResource(uri);
@@ -267,4 +234,5 @@ public class RecycleBinManager {
resource.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
return resource;
}
}

View File

@@ -1,12 +0,0 @@
package org.talend.core.repository.services;
public interface IGitContentService {
public abstract void setMenu(Object object);
public abstract boolean isGIT();
public abstract void createDropdownCombo(Object composite);
public abstract void configureCombo(String descriptor);
}

View File

@@ -390,7 +390,7 @@ public class CopyObjectAction {
ITestContainerProviderService testContainerService = (ITestContainerProviderService) GlobalServiceRegister
.getDefault().getService(ITestContainerProviderService.class);
if (testContainerService != null) {
testContainerService.copyDataFiles(newItem, sourceNode.getId());
testContainerService.copyDataFiles(newItem, sourceNode);
for (IRepositoryNode testNode : sourceNode.getChildren()) {
Item testItem = testNode.getObject().getProperty().getItem();
if (!(testItem instanceof ProcessItem)) {
@@ -426,8 +426,7 @@ public class CopyObjectAction {
}
}
if (sourceNode.getObjectType() != ERepositoryObjectType.PROCESS
&& sourceNode.getObjectType() != ERepositoryObjectType.PROCESS_MR
&& sourceNode.getObjectType() != ERepositoryObjectType.PROCESS_STORM) {
&& sourceNode.getObjectType() != ERepositoryObjectType.PROCESS_MR) {
return false;
}
if (!(newItem instanceof ProcessItem)) {

View File

@@ -107,9 +107,8 @@ public class CreateFolderAction extends AContextualAction {
canWork = false;
break;
case SYSTEM_FOLDER:
if (property == null || property.equals(ERepositoryObjectType.GENERATED)
|| property.equals(ERepositoryObjectType.JOB_DOC) || property.equals(ERepositoryObjectType.JOBLET_DOC)
|| ERepositoryObjectType.SQLPATTERNS.equals(property)
if (ERepositoryObjectType.GENERATED.equals(property) || ERepositoryObjectType.JOBS.equals(property)
|| ERepositoryObjectType.JOBLETS.equals(property) || ERepositoryObjectType.SQLPATTERNS.equals(property)
|| ERepositoryObjectType.REFERENCED_PROJECTS.equals(property)
|| ERepositoryObjectType.SVN_ROOT.equals(property)) {
canWork = false;
@@ -123,7 +122,7 @@ public class CreateFolderAction extends AContextualAction {
}
break;
case SIMPLE_FOLDER:
if (property.equals(ERepositoryObjectType.JOB_DOC) || property.equals(ERepositoryObjectType.JOBLET_DOC)
if (ERepositoryObjectType.JOB_DOC.equals(property) || ERepositoryObjectType.JOBLET_DOC.equals(property)
|| (ERepositoryObjectType.SQLPATTERNS.equals(property) && !isUnderUserDefined(node))) {
canWork = false;
} else if (property != null

View File

@@ -93,7 +93,6 @@ import org.talend.core.repository.utils.RepositoryNodeDeleteManager;
import org.talend.core.repository.utils.RepositoryReferenceBeanUtils;
import org.talend.core.repository.utils.TDQServiceRegister;
import org.talend.core.runtime.CoreRuntimePlugin;
import org.talend.core.runtime.services.IGenericWizardService;
import org.talend.core.service.ICoreUIService;
import org.talend.core.ui.ITestContainerProviderService;
import org.talend.cwm.helper.SubItemHelper;
@@ -485,12 +484,11 @@ public class DeleteAction extends AContextualAction {
if (!objectType.getKey().toString().startsWith("repository.metadata") && objectType != ERepositoryObjectType.SQLPATTERNS //$NON-NLS-1$
&& objectType != ERepositoryObjectType.ROUTINES && objectType != ERepositoryObjectType.getType("BEANS")
&& objectType != ERepositoryObjectType.JOB_SCRIPT && curItem.getParent() instanceof FolderItem
&& ((Item) curItem.getParent()).getParent() instanceof FolderItem && !objectType.isDQItemType()
&& !isGenericType(objectType)) {// MOD
// qiongli
// 2011-1-20
// except
// DQItem.
&& ((Item) curItem.getParent()).getParent() instanceof FolderItem && !objectType.isDQItemType()) {// MOD
// qiongli
// 2011-1-20
// except
// DQItem.
FolderItem parentFolder = (FolderItem) curItem.getParent();
if ("".equals(fullPath)) { //$NON-NLS-1$
fullPath = parentFolder.getProperty().getLabel() + fullPath;
@@ -563,17 +561,6 @@ public class DeleteAction extends AContextualAction {
this.setChildFolderPath(folderItem);
}
private boolean isGenericType(ERepositoryObjectType objectType) {
IGenericWizardService wizardService = null;
if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault().getService(IGenericWizardService.class);
}
if (wizardService != null && wizardService.isGenericType(objectType)) {
return true;
}
return false;
}
private void setChildFolderPath(FolderItem folderItem) {
EList childFoderList = folderItem.getChildren();
for (Object o : childFoderList) {
@@ -1193,36 +1180,29 @@ public class DeleteAction extends AContextualAction {
return true;
}
ERepositoryObjectType contentType = node.getContentType();
// Avoid to delete all related documentation node by click Key "Delete" from keyboard.
if (ERepositoryObjectType.JOB_DOC != null && contentType != null) {
if (contentType.equals(ERepositoryObjectType.JOB_DOC)) {
return true;
}
}
if (ERepositoryObjectType.JOB_DOC != null && node.getProperties(EProperties.CONTENT_TYPE) != null) {
if (node.getProperties(EProperties.CONTENT_TYPE).equals(ERepositoryObjectType.JOB_DOC)) {
return true;
}
if (node.getContentType() == ERepositoryObjectType.JOB_DOC) {
return true;
}
if (ERepositoryObjectType.JOBLET_DOC != null && contentType != null) {
if (contentType.equals(ERepositoryObjectType.JOBLET_DOC)) {
return true;
}
}
if (ERepositoryObjectType.JOBLET_DOC != null && node.getProperties(EProperties.CONTENT_TYPE) != null) {
if (node.getProperties(EProperties.CONTENT_TYPE).equals(ERepositoryObjectType.JOBLET_DOC)) {
return true;
}
if (node.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.JOB_DOC) {
return true;
}
if (ERepositoryObjectType.GENERATED != null && contentType != null) {
if (contentType.equals(ERepositoryObjectType.GENERATED)) {
return true;
}
if (node.getContentType() == ERepositoryObjectType.JOBLET_DOC) {
return true;
}
if (node.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.JOBLET_DOC) {
return true;
}
if (node.getContentType() == ERepositoryObjectType.JOBS) {
return true;
}
if (node.getContentType() == ERepositoryObjectType.GENERATED) {
return true;
}
if (node.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.METADATA_CON_CDC) {
return true;
}
@@ -1515,8 +1495,8 @@ public class DeleteAction extends AContextualAction {
label = (String) obj;
}
boolean isGointoCondition = false;
if (node.getContentType().equals(ERepositoryObjectType.JOB_DOC)
|| node.getContentType().equals(ERepositoryObjectType.JOBLET_DOC)
if (node.getContentType() == ERepositoryObjectType.JOB_DOC
|| node.getContentType() == ERepositoryObjectType.JOBLET_DOC
|| RepositoryConstants.USER_DEFINED.equals(label)) {
visible = false;
isGointoCondition = true;

View File

@@ -152,8 +152,8 @@ public class DuplicateAction extends AContextualAction {
} else if (node.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.JOB_DOC
|| node.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.JOBLET_DOC) {
canWork = false;
} else if (node.getContentType() == ERepositoryObjectType.JOB_DOC
|| node.getContentType() == ERepositoryObjectType.JOBLET_DOC
} else if (node.getContentType() == ERepositoryObjectType.JOBS
|| node.getContentType() == ERepositoryObjectType.JOBLETS
|| node.getContentType() == ERepositoryObjectType.GENERATED
|| node.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.JOB_DOC
|| node.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.JOBLET_DOC) {
@@ -343,7 +343,7 @@ public class DuplicateAction extends AContextualAction {
ITestContainerProviderService testContainerService = (ITestContainerProviderService) GlobalServiceRegister
.getDefault().getService(ITestContainerProviderService.class);
if (testContainerService != null) {
testContainerService.copyDataFiles(newItem, sourceNode.getId());
testContainerService.copyDataFiles(newItem, sourceNode);
for (IRepositoryNode testNode : this.sourceNode.getChildren()) {
Item testItem = testNode.getObject().getProperty().getItem();
if (!(testItem instanceof ProcessItem)) {
@@ -511,7 +511,7 @@ public class DuplicateAction extends AContextualAction {
private boolean isKeyword(String itemName) {
ERepositoryObjectType itemType = sourceNode.getObjectType();
ERepositoryObjectType[] types = { ERepositoryObjectType.PROCESS, ERepositoryObjectType.ROUTINES,
ERepositoryObjectType.JOB_DOC, ERepositoryObjectType.JOBLET, ERepositoryObjectType.JOBLET_DOC,
ERepositoryObjectType.JOBS, ERepositoryObjectType.JOBLET, ERepositoryObjectType.JOBLETS,
ERepositoryObjectType.JOB_SCRIPT };
List<ERepositoryObjectType> arraysList = Arrays.asList(types);
List<ERepositoryObjectType> typeList = new ArrayList<ERepositoryObjectType>();

View File

@@ -95,22 +95,7 @@ public class PasteAction extends AContextualAction {
} catch (BusinessException e) {
jobNewName = sourceNode.getObject().getLabel();
}
//
Object sourceFramework = null;
if (sourceNode.getObject() != null) {
sourceFramework = sourceNode.getObject().getProperty().getAdditionalProperties()
.get(ConvertJobsUtil.FRAMEWORK);
}
ConvertJobsUtil.createOperation(jobNewName, jobTypeValue, frameworkNewValue, sourceNode.getObject());
// reset the framework
if (sourceNode.getObject() != null) {
Object currentFramework = sourceNode.getObject().getProperty().getAdditionalProperties()
.get(ConvertJobsUtil.FRAMEWORK);
if (sourceFramework != null && currentFramework != null && !sourceFramework.equals(currentFramework)) {
sourceNode.getObject().getProperty().getAdditionalProperties()
.put(ConvertJobsUtil.FRAMEWORK, sourceFramework);
}
}
} else {
try {
if (copyObjectAction.validateAction((RepositoryNode) currentSource, target)) {
@@ -181,8 +166,8 @@ public class PasteAction extends AContextualAction {
IProxyRepositoryFactory proxyFactory = ProxyRepositoryFactory.getInstance();
IRepositoryViewObject object = target.getObject();
if (target.getContentType() == ERepositoryObjectType.JOB_DOC
|| target.getContentType() == ERepositoryObjectType.JOBLET_DOC
if (target.getContentType() == ERepositoryObjectType.JOBS
|| target.getContentType() == ERepositoryObjectType.JOBLETS
|| target.getContentType() == ERepositoryObjectType.GENERATED
|| target.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.JOB_DOC
|| target.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.JOBLET_DOC

View File

@@ -26,7 +26,6 @@ import org.eclipse.swt.graphics.Image;
import org.talend.commons.runtime.model.repository.ECDCStatus;
import org.talend.commons.runtime.model.repository.ERepositoryStatus;
import org.talend.commons.ui.runtime.image.ECoreImage;
import org.talend.commons.ui.runtime.image.EImage;
import org.talend.commons.ui.runtime.image.IImage;
import org.talend.commons.ui.runtime.image.ImageProvider;
import org.talend.commons.ui.runtime.image.ImageUtils;
@@ -37,7 +36,6 @@ import org.talend.core.PluginChecker;
import org.talend.core.context.Context;
import org.talend.core.context.RepositoryContext;
import org.talend.core.model.metadata.builder.connection.MetadataTable;
import org.talend.core.model.metadata.builder.connection.SAPBWTable;
import org.talend.core.model.properties.DatabaseConnectionItem;
import org.talend.core.model.properties.Item;
import org.talend.core.model.properties.JobletProcessItem;
@@ -52,19 +50,16 @@ import org.talend.core.model.repository.RepositoryViewObject;
import org.talend.core.repository.model.ProxyRepositoryFactory;
import org.talend.core.repository.model.repositoryObject.MetadataTableRepositoryObject;
import org.talend.core.runtime.CoreRuntimePlugin;
import org.talend.core.runtime.services.IGenericWizardService;
import org.talend.core.ui.ICDCProviderService;
import org.talend.core.ui.IReferencedProjectService;
import org.talend.core.ui.ITestContainerProviderService;
import org.talend.core.ui.branding.IBrandingService;
import org.talend.core.ui.images.RepositoryImageProvider;
import org.talend.cwm.helper.SAPBWTableHelper;
import org.talend.repository.ProjectManager;
import org.talend.repository.model.IProxyRepositoryFactory;
import org.talend.repository.model.IRepositoryNode.ENodeType;
import org.talend.repository.model.RepositoryNode;
import org.talend.repository.ui.views.IRepositoryView;
import org.talend.utils.string.MD5;
/**
* Label provider for the repository view. <code>DEBUG</code> boolean field specify if details (such as objects ids)
@@ -184,20 +179,6 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
|| repositoryObjectType == ERepositoryObjectType.METADATA_SALESFORCE_MODULE
|| repositoryObjectType == ERepositoryObjectType.METADATA_CON_COLUMN) {
label = label + object.getLabel();
if (object instanceof MetadataTableRepositoryObject) {
MetadataTable table = ((MetadataTableRepositoryObject) object).getTable();
if (table instanceof SAPBWTable) {
SAPBWTable bwTable = (SAPBWTable) table;
if (SAPBWTableHelper.TYPE_INFOOBJECT.equals(bwTable.getModelType())) {
String innerType = bwTable.getInnerIOType();
if (innerType != null && !innerType.equals(SAPBWTableHelper.IO_INNERTYPE_BASIC)) {
label = label + " (" + innerType + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
}
}
if (!mainProject.getLabel().equals(projectLabel) && PluginChecker.isRefProjectLoaded()) {
IReferencedProjectService service = (IReferencedProjectService) GlobalServiceRegister.getDefault()
@@ -265,12 +246,6 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
img = RepositoryNodeProviderRegistryReader.getInstance().getImage(itemType);
if (img == null) {
IImage icon = RepositoryImageProvider.getIcon(itemType);
if (icon == null || EImage.DEFAULT_IMAGE.equals(icon)) {
Image image = getImageFromFramework(itemType);
if (image != null) {
return image;
}
}
if (icon != null) {
img = ImageProvider.getImage(icon);
}
@@ -296,17 +271,6 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
return OverlayImageProvider.getImageWithStatus(image, informationStatus);
}
protected Image getImageFromFramework(ERepositoryObjectType itemType) {
IGenericWizardService wizardService = null;
if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault().getService(IGenericWizardService.class);
}
if (wizardService != null && wizardService.isGenericType(itemType)) {
return wizardService.getNodeImage(itemType.getType());
}
return null;
}
public static Image getDefaultJobletImage() {
return ImageProvider.getImage(ECoreImage.JOBLET_COMPONENT_ICON);
}
@@ -333,12 +297,11 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
ImageDescriptor imageDesc = ImageUtils.createImageFromData(item.getIcon().getInnerContent());
imageDesc = ImageUtils.scale(imageDesc, ICON_SIZE.ICON_32);
String md5Desc = MD5.getMD5(item.getIcon().getInnerContent());
image = cachedImages.get(md5Desc);
image = cachedImages.get(item.getIcon().getInnerContent());
if (image == null || image.isDisposed()) {
image = imageDesc.createImage();
cachedImages.put(md5Desc, image);
cachedImages.put(item.getIcon().getInnerContent(), image);
} else {
// image = imageDesc.createImage();
}
@@ -346,7 +309,7 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
return image;
}
private static Map<String, Image> cachedImages = new HashMap<String, Image>();
private static Map<byte[], Image> cachedImages = new HashMap<byte[], Image>();
@Override
public Image getImage(Object obj) {
@@ -361,16 +324,10 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
switch (node.getType()) {
case STABLE_SYSTEM_FOLDER:
case SYSTEM_FOLDER:
ERepositoryObjectType contentType = node.getContentType();
if (nodeIcon == null || EImage.DEFAULT_IMAGE.equals(nodeIcon)) {
Image image = getImageFromFramework(contentType);
if (image != null) {
return image;
}
}
if (nodeIcon != null) {
return ImageProvider.getImage(nodeIcon);
}
ERepositoryObjectType contentType = node.getContentType();
if (contentType != null) {
Image image = RepositoryNodeProviderRegistryReader.getInstance().getImage(contentType);
if (image != null) {

View File

@@ -12,7 +12,6 @@
// ============================================================================
package org.talend.core.repository.utils;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -20,9 +19,7 @@ import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.custom.CCombo;
@@ -36,7 +33,7 @@ import org.talend.core.GlobalServiceRegister;
import org.talend.core.PluginChecker;
import org.talend.core.hadoop.HadoopConstants;
import org.talend.core.hadoop.IHadoopDistributionService;
import org.talend.core.model.general.Project;
import org.talend.core.hadoop.version.EHadoopVersion4Drivers;
import org.talend.core.model.process.IElementParameter;
import org.talend.core.model.process.IProcess;
import org.talend.core.model.properties.Item;
@@ -46,8 +43,6 @@ import org.talend.core.model.repository.ERepositoryObjectType;
import org.talend.core.model.repository.IRepositoryViewObject;
import org.talend.core.repository.i18n.Messages;
import org.talend.core.runtime.CoreRuntimePlugin;
import org.talend.core.runtime.hd.IHDConstants;
import org.talend.core.runtime.hd.IHDistributionVersion;
import org.talend.core.ui.ITestContainerProviderService;
import org.talend.designer.core.convert.IProcessConvertService;
import org.talend.designer.core.convert.IProcessConvertToAllTypeService;
@@ -322,8 +317,8 @@ public class ConvertJobsUtil {
ERepositoryObjectType oldRepType = (oldJobType == null ? null : oldJobType.getERepositoryObjectType());
ERepositoryObjectType newRepType = (newJobType == null ? null : newJobType.getERepositoryObjectType());
boolean isNeedConvert = ProcessConvertManager.getInstance().CheckConvertProcess(oldRepType, oldFrameworkValue,
newRepType, newFrameworkValue);
boolean isNeedConvert = ProcessConvertManager.getInstance().CheckConvertProcess(oldRepType, oldFrameworkValue, newRepType,
newFrameworkValue);
// if need popup warning, then do this check
if (isNeedConvert && needPopupWarning) {
@@ -332,29 +327,29 @@ public class ConvertJobsUtil {
boolean isSparkStreaming = SPARKSTREAMING_FRAMEWORK.equals(newFrameworkValue);
if (isSpark || isSparkStreaming) {
try {
IProcessConvertService converter = ProcessConvertManager.getInstance().extractConvertService(
ProcessConverterType.CONVERTER_FOR_MAPREDUCE);
IProcessConvertService converter = ProcessConvertManager.getInstance()
.extractConvertService(ProcessConverterType.CONVERTER_FOR_MAPREDUCE);
IProcess process = converter.getProcessFromItem(originalItem, false);
IElementParameter mrVersion = process.getElementParameter(MR_VERSION);
if (mrVersion != null
&& GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopDistributionService.class)) {
IHadoopDistributionService hadoopService = (IHadoopDistributionService) GlobalServiceRegister
.getDefault().getService(IHadoopDistributionService.class);
IHDistributionVersion distributionVersion = hadoopService.getHadoopDistributionVersion(
(String) mrVersion.getValue(), false);
if (distributionVersion != null) {
boolean isSupport = false;
if (isSpark) {
isSupport = hadoopService.doSupportService(distributionVersion, IHDConstants.SERVICE_SPARK);
} else if (isSparkStreaming) {
isSupport = hadoopService.doSupportService(distributionVersion,
IHDConstants.SERVICE_SPARK_STREAMING);
}
if (!isSupport) {
MessageDialog.openWarning(Display.getDefault().getActiveShell(),
Messages.getString("ConvertJobsUtil.warning.title"), //$NON-NLS-1$
Messages.getString("ConvertJobsUtil.warning.message")); //$NON-NLS-1$
if (mrVersion != null) {
EHadoopVersion4Drivers hadoopVersion = EHadoopVersion4Drivers
.indexOfByVersion((String) mrVersion.getValue());
if (hadoopVersion != null) {
if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopDistributionService.class)) {
IHadoopDistributionService hadoopService = (IHadoopDistributionService) GlobalServiceRegister
.getDefault().getService(IHadoopDistributionService.class);
boolean isSupport = false;
if (isSpark) {
isSupport = hadoopService.isSupportSpark(hadoopVersion);
} else if (isSparkStreaming) {
isSupport = hadoopService.isSupportSparkStreaming(hadoopVersion);
}
if (!isSupport) {
MessageDialog.openWarning(Display.getDefault().getActiveShell(),
Messages.getString("ConvertJobsUtil.warning.title"), //$NON-NLS-1$
Messages.getString("ConvertJobsUtil.warning.message")); //$NON-NLS-1$
}
}
}
}
@@ -369,18 +364,6 @@ public class ConvertJobsUtil {
return isNeedConvert;
}
public static boolean hasTestCase(Project project, Property property) {
boolean hasTestCase = false;
if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
ITestContainerProviderService testContainerService = (ITestContainerProviderService) GlobalServiceRegister
.getDefault().getService(ITestContainerProviderService.class);
if (testContainerService != null) {
hasTestCase = testContainerService.hasTestCase(project, property);
}
}
return hasTestCase;
}
public static boolean hasTestCase(Property property) {
boolean hasTestCase = false;
if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
@@ -436,7 +419,7 @@ public class ConvertJobsUtil {
if (newItem == null) {
return false;
}
convertTestcases(newItem,sourceObject,jobTypeValue);
boolean isNewItemCreated = true;
Property repositoryProperty = sourceObject.getProperty();
if (repositoryProperty != null) {
@@ -489,38 +472,6 @@ public class ConvertJobsUtil {
}
return isNewItemCreated;
}
public static void convertTestcases(final Item newItem,final IRepositoryViewObject sourceObject,final String jobTypeValue){
if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
ITestContainerProviderService testContainerService = (ITestContainerProviderService) GlobalServiceRegister
.getDefault().getService(ITestContainerProviderService.class);
if (testContainerService != null) {
testContainerService.copyDataFiles(newItem, sourceObject.getId());
Item item = sourceObject.getProperty().getItem();
if(!(item instanceof ProcessItem)){
return;
}
testContainerService.copyTestCase(newItem, (ProcessItem)item, getTestCasePath(newItem,jobTypeValue), null, true);
}
}
}
public static IPath getTestCasePath(Item newItem, String jobTypeValue) {
StringBuffer pathName = new StringBuffer();
if (JobType.STANDARD.getDisplayName().equals(jobTypeValue)) {
pathName.append(JobType.STANDARD.repositoryObjectType.getFolder());
}else if (JobType.BIGDATASTREAMING.getDisplayName().equals(jobTypeValue)){
pathName.append(JobType.BIGDATASTREAMING.repositoryObjectType.getFolder());
}else if (JobType.BIGDATABATCH.getDisplayName().equals(jobTypeValue)){
pathName.append(JobType.BIGDATABATCH.repositoryObjectType.getFolder());
} else {
pathName.append("process");
}
pathName.append(File.separator).append(newItem.getProperty().getId());
final Path path = new Path(pathName.toString());
return path;
}
/**
* DOC nrousseau Comment method "getFrameworkItemsByJobType".

View File

@@ -15,6 +15,7 @@ Export-Package: org.talend.commons.utils.generation,
org.talend.core.database.conn,
org.talend.core.database.conn.template,
org.talend.core.database.conn.version,
org.talend.core.database.hbase.conn.version,
org.talend.core.database.utils,
org.talend.core.download,
org.talend.core.exception,
@@ -52,8 +53,7 @@ Export-Package: org.talend.commons.utils.generation,
org.talend.core.prefs,
org.talend.core.repository,
org.talend.core.runtime,
org.talend.core.runtime.hd,
org.talend.core.runtime.hd.hive,
org.talend.core.runtime.conf,
org.talend.core.runtime.maven,
org.talend.core.runtime.preference,
org.talend.core.runtime.process,
@@ -110,13 +110,10 @@ Require-Bundle: org.eclipse.jdt.core,
org.talend.commons.runtime;visibility:=reexport,
org.talend.commons.ui,
org.ops4j.pax.url.mvn,
org.talend.components.api,
org.apache.servicemix.bundles.avro,
jackson-core-asl
org.talend.components.api
Bundle-Activator: org.talend.core.runtime.CoreRuntimePlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
lib/resty-0.3.2.jar,
lib/json_simple-1.1.jar
Eclipse-RegisterBuddy: org.talend.testutils
Bundle-RequiredExecutionEnvironment: JavaSE-1.7

View File

@@ -12,6 +12,7 @@ bin.includes = META-INF/,\
lib/,\
talend_metadata_columns_schema.xsd,\
talend_targetschema_columns_schema.xsd,\
resources/,\
dist/
src.includes = META-INF/,\
mappingMetadataTypes.xml,\

View File

@@ -1,162 +0,0 @@
<?xml version="1.0"?>
<mapping>
<dbms product="Cassandra" id="cassandra22_datastax_id" label="Mapping Cassandra"
default="true">
<dbTypes>
<dbType type="ascii" ignorePre="true" />
<dbType type="bigint" ignorePre="true" />
<dbType type="blob" ignorePre="true" />
<dbType type="boolean" ignorePre="true" />
<dbType type="counter" ignorePre="true" />
<dbType type="date" ignorePre="true" />
<dbType type="decimal" ignorePre="true" />
<dbType type="double" ignorePre="true" />
<dbType type="float" ignorePre="true" />
<dbType type="inet" ignorePre="true" />
<dbType type="int" ignorePre="true" />
<dbType type="list" ignorePre="true" />
<dbType type="map" ignorePre="true" />
<dbType type="set" ignorePre="true" />
<dbType type="smallint" ignorePre="true" />
<dbType type="text" ignorePre="true" />
<dbType type="time" ignorePre="true" />
<dbType type="timestamp" ignorePre="true" />
<dbType type="timeuuid" ignorePre="true" />
<dbType type="tinyint" ignorePre="true" />
<dbType type="uuid" ignorePre="true" />
<dbType type="varchar" ignorePre="true" />
<dbType type="varint" ignorePre="true" />
</dbTypes>
<language name="java">
<talendToDbTypes>
<talendType type="id_List">
<dbType type="list" default="true"/>
</talendType>
<talendType type="id_Boolean">
<dbType type="boolean" default="true" />
</talendType>
<talendType type="id_Byte">
<dbType type="tinyint" default="true" />
</talendType>
<talendType type="id_byte[]">
<dbType type="blob" default="true" />
</talendType>
<talendType type="id_Character">
<dbType type="ascii" default="true" />
<dbType type="text" />
<dbType type="varchar" />
</talendType>
<talendType type="id_Date">
<dbType type="timestamp" default="true" />
<dbType type="date" />
</talendType>
<talendType type="id_BigDecimal">
<dbType type="decimal" default="true" />
</talendType>
<talendType type="id_Double">
<dbType type="double" default="true" />
</talendType>
<talendType type="id_Float">
<dbType type="float" default="true" />
</talendType>
<talendType type="id_Integer">
<dbType type="int" default="true" />
</talendType>
<talendType type="id_Long">
<dbType type="bigint" default="true" />
<dbType type="counter" />
<dbType type="time" />
</talendType>
<talendType type="id_Object">
<dbType type="varint" default="true" />
<dbType type="inet" />
<dbType type="map" />
<dbType type="set" />
</talendType>
<talendType type="id_Short">
<dbType type="smallint" default="true" />
</talendType>
<talendType type="id_String">
<dbType type="ascii" default="true" />
<dbType type="text" />
<dbType type="timeuuid" />
<dbType type="uuid" />
<dbType type="varchar" />
</talendType>
</talendToDbTypes>
<dbToTalendTypes>
<dbType type="ascii">
<talendType type="id_String" default="true" />
</dbType>
<dbType type="bigint">
<talendType type="id_Long" default="true" />
</dbType>
<dbType type="blob">
<talendType type="id_byte[]" default="true" />
</dbType>
<dbType type="boolean">
<talendType type="id_Boolean" default="true" />
</dbType>
<dbType type="counter">
<talendType type="id_Long" default="true" />
</dbType>
<dbType type="date">
<talendType type="id_Date" default="true" />
</dbType>
<dbType type="decimal">
<talendType type="id_BigDecimal" default="true" />
</dbType>
<dbType type="double">
<talendType type="id_Double" default="true" />
</dbType>
<dbType type="float">
<talendType type="id_Float" default="true" />
</dbType>
<dbType type="inet">
<talendType type="id_Object" default="true" />
</dbType>
<dbType type="int">
<talendType type="id_Integer" default="true" />
</dbType>
<dbType type="list">
<talendType type="id_List" default="true" />
</dbType>
<dbType type="map">
<talendType type="id_Object" default="true" />
</dbType>
<dbType type="set">
<talendType type="id_Object" default="true" />
</dbType>
<dbType type="smallint">
<talendType type="id_Short" default="true" />
</dbType>
<dbType type="text">
<talendType type="id_String" default="true" />
</dbType>
<dbType type="time">
<talendType type="id_Long" default="true" />
</dbType>
<dbType type="timestamp">
<talendType type="id_Date" default="true" />
</dbType>
<dbType type="timeuuid">
<talendType type="id_String" default="true" />
</dbType>
<dbType type="tinyint">
<talendType type="id_Byte" default="true" />
</dbType>
<dbType type="uuid">
<talendType type="id_String" default="true" />
</dbType>
<dbType type="varchar">
<talendType type="id_String" default="true" />
</dbType>
<dbType type="varint">
<talendType type="id_Object" default="true" />
</dbType>
</dbToTalendTypes>
</language>
</dbms>
</mapping>

View File

@@ -82,6 +82,7 @@
<dbToTalendTypes>
<dbType type="ascii">
<talendType type="id_String" default="true" />
<talendType type="id_Character" />
</dbType>
<dbType type="bigint">
<talendType type="id_Long" default="true" />
@@ -109,6 +110,8 @@
</dbType>
<dbType type="int">
<talendType type="id_Integer" default="true" />
<talendType type="id_Short" />
<talendType type="id_Byte"/>
</dbType>
<dbType type="list">
<talendType type="id_List" default="true" />
@@ -121,6 +124,7 @@
</dbType>
<dbType type="text">
<talendType type="id_String" default="true" />
<talendType type="id_Character" />
</dbType>
<dbType type="timestamp">
<talendType type="id_Date" default="true" />
@@ -133,6 +137,7 @@
</dbType>
<dbType type="varchar">
<talendType type="id_String" default="true" />
<talendType type="id_Character" />
</dbType>
<dbType type="varint">
<talendType type="id_Object" default="true" />

View File

@@ -9,13 +9,11 @@
<dbType type="INT" ignoreLen="true" ignorePre="true"/>
<dbType type="TINYINT" ignoreLen="true" ignorePre="true"/>
<dbType type="STRING" ignoreLen="true" ignorePre="true"/>
<dbType type="DECIMAL" ignoreLen="false" ignorePre="false"/>
<dbType type="BOOLEAN" ignoreLen="true" ignorePre="true"/>
<dbType type="STRUCT" ignoreLen="true" ignorePre="true"/>
<dbType type="MAP" ignoreLen="true" ignorePre="true"/>
<dbType type="ARRAY" ignoreLen="true" ignorePre="true"/>
<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true"/>
<dbType type="DATE" ignoreLen="true" ignorePre="true"/>
</dbTypes>
<language name="java">
@@ -36,11 +34,9 @@
</talendType>
<talendType type="id_Date">
<dbType type="TIMESTAMP" default="true"/>
<dbType type="DATE"/>
</talendType>
<talendType type="id_BigDecimal">
<dbType type="DECIMAL" default="true"/>
<dbType type="BIGINT"/>
<dbType type="BIGINT" default="true"/>
<dbType type="FLOAT"/>
<dbType type="DOUBLE"/>
</talendType>
@@ -84,9 +80,6 @@
<talendType type="id_BigDecimal"/>
<talendType type="id_Float"/>
</dbType>
<dbType type="DECIMAL">
<talendType type="id_BigDecimal" default="true"/>
</dbType>
<dbType type="BIGINT">
<talendType type="id_BigDecimal" default="true"/>
<talendType type="id_Byte"/>
@@ -118,10 +111,7 @@
<dbType type="ARRAY">
<talendType type="id_Object" default="true"/>
</dbType>
<dbType type="TIMESTAMP">
<talendType type="id_Date" default="true"/>
</dbType>
<dbType type="DATE">
<dbType type="TIMESTAMP">
<talendType type="id_Date" default="true"/>
</dbType>
</dbToTalendTypes>

View File

@@ -1,102 +0,0 @@
<?xml version="1.0"?>
<mapping>
<dbms product="Redshift" id="redshift_new_id" label="Mapping Redshift"
default="true">
<dbTypes>
<dbType type="SMALLINT" ignoreLen="true" ignorePre="true" />
<dbType type="INTEGER" ignoreLen="true" ignorePre="true" />
<dbType type="BIGINT" ignoreLen="true" ignorePre="true" />
<dbType type="DECIMAL" ignoreLen="true" />
<dbType type="REAL" ignoreLen="true" />
<dbType type="DOUBLE PRECISION" ignoreLen="true" />
<dbType type="BOOLEAN" ignoreLen="true" ignorePre="true" />
<dbType type="CHAR" ignoreLen="true" ignorePre="true" />
<dbType type="VARCHAR" ignorePre="true" />
<dbType type="DATE" ignoreLen="true" ignorePre="true" />
<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true" />
</dbTypes>
<language name="java">
<talendToDbTypes>
<talendType type="id_List">
</talendType>
<talendType type="id_Boolean">
<dbType type="BOOLEAN" default="true" />
</talendType>
<talendType type="id_Byte">
</talendType>
<talendType type="id_byte[]">
</talendType>
<talendType type="id_Character">
</talendType>
<talendType type="id_Date">
<dbType type="DATE" default="true" />
<dbType type="TIMESTAMP" />
</talendType>
<talendType type="id_BigDecimal">
<dbType type="DECIMAL" default="true" />
<dbType type="BIGINT" />
</talendType>
<talendType type="id_Double">
<dbType type="DOUBLE PRECISION" default="true" />
<dbType type="REAL" />
</talendType>
<talendType type="id_Float">
</talendType>
<talendType type="id_Integer">
<dbType type="INTEGER" default="true" />
<dbType type="SMALLINT" />
</talendType>
<talendType type="id_Long">
<dbType type="BIGINT" default="true" />
<dbType type="INTEGER" />
</talendType>
<talendType type="id_Object">
</talendType>
<talendType type="id_Short">
</talendType>
<talendType type="id_String">
<dbType type="VARCHAR" default="true" />
<dbType type="CHAR" />
</talendType>
</talendToDbTypes>
<dbToTalendTypes>
<dbType type="SMALLINT">
<talendType type="id_Integer" default="true" />
</dbType>
<dbType type="INTEGER">
<talendType type="id_Integer" default="true" />
<talendType type="id_Long" />
</dbType>
<dbType type="BIGINT">
<talendType type="id_Long" default="true" />
<talendType type="id_BigDecimal" />
</dbType>
<dbType type="DECIMAL">
<talendType type="id_BigDecimal" default="true" />
</dbType>
<dbType type="REAL">
<talendType type="id_Double" default="true" />
</dbType>
<dbType type="DOUBLE PRECISION">
<talendType type="id_Double" default="true" />
</dbType>
<dbType type="BOOLEAN">
<talendType type="id_Boolean" default="true" />
</dbType>
<dbType type="CHAR">
<talendType type="id_String" default="true" />
</dbType>
<dbType type="VARCHAR">
<talendType type="id_String" default="true" />
</dbType>
<dbType type="DATE">
<talendType type="id_Date" default="true" />
</dbType>
<dbType type="TIMESTAMP">
<talendType type="id_Date" default="true" />
</dbType>
</dbToTalendTypes>
</language>
</dbms>
</mapping>

View File

@@ -1,27 +1,27 @@
<?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>6.2.0</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.runtime</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<?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>6.2.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.runtime</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -0,0 +1,191 @@
{"HADOOP": {
"HORTONWORKS": {
"NAMENODE_URI": "hdfs://localhost:8020",
"JOBTRACKER": "localhost:50300",
"RESOURCE_MANAGER": "localhost:8050",
"RESOURCEMANAGER_SCHEDULER_ADDRESS": "localhost:8030",
"JOBHISTORY_ADDRESS": "0.0.0.0:10020",
"STAGING_DIRECTORY": "/user",
"NAMENODE_PRINCIPAL": "nn/_HOST@EXAMPLE.COM",
"JOBTRACKER_PRINCIPAL" : "mapred/_HOST@EXAMPLE.COM",
"RESOURCE_MANAGER_PRINCIPAL" : "yarn/_HOST@EXAMPLE.COM",
"JOBHISTORY_PRINCIPAL" : "mapred/_HOST@EXAMPLE.COM",
"HIVE": {
"EMBEDDED": {
"PORT": 9083
},
"STANDALONE": {
"PORT": 10000
},
"DATABASE": "default",
"HIVE_PRINCIPAL": "hive/_HOST@EXAMPLE.COM"
},
"HBASE": {
"PORT": 2181
}
},
"CLOUDERA": {
"NAMENODE_URI": "hdfs://localhost:8020",
"JOBTRACKER": "localhost:8021",
"RESOURCE_MANAGER": "localhost:8032",
"RESOURCEMANAGER_SCHEDULER_ADDRESS": "localhost:8030",
"JOBHISTORY_ADDRESS": "0.0.0.0:10020",
"STAGING_DIRECTORY": "/user",
"NAMENODE_PRINCIPAL": "hdfs/_HOST@EXAMPLE.COM",
"JOBTRACKER_PRINCIPAL" : "mapred/_HOST@EXAMPLE.COM",
"RESOURCE_MANAGER_PRINCIPAL" : "yarn/_HOST@EXAMPLE.COM",
"JOBHISTORY_PRINCIPAL" : "mapred/_HOST@EXAMPLE.COM",
"HIVE": {
"EMBEDDED": {
"PORT": 9083
},
"STANDALONE": {
"PORT": 10000
},
"DATABASE": "default",
"HIVE_PRINCIPAL": "hive/_HOST@EXAMPLE.COM"
},
"HBASE": {
"PORT": 2181
}
},
"MAPR": {
"NAMENODE_URI": "maprfs:///localhost:7222",
"JOBTRACKER": "localhost:9001",
"RESOURCE_MANAGER": "localhost:8032",
"RESOURCEMANAGER_SCHEDULER_ADDRESS": "localhost:8030",
"JOBHISTORY_ADDRESS": "0.0.0.0:10020",
"STAGING_DIRECTORY": "/user",
"HIVE": {
"EMBEDDED": {
"PORT": 9083
},
"STANDALONE": {
"PORT": 10000
},
"DATABASE": "default",
"HIVE_PRINCIPAL": "hive/_HOST@EXAMPLE.COM"
},
"HBASE": {
"PORT": 5181
}
},
"APACHE": {
"NAMENODE_URI": "hdfs://localhost:9000",
"JOBTRACKER": "localhost:9001",
"RESOURCEMANAGER_SCHEDULER_ADDRESS": "localhost:8030",
"JOBHISTORY_ADDRESS": "0.0.0.0:10020",
"STAGING_DIRECTORY": "/user",
"NAMENODE_PRINCIPAL": "nn/_HOST@EXAMPLE.COM",
"JOBTRACKER_PRINCIPAL" : "mapred/_HOST@EXAMPLE.COM",
"RESOURCE_MANAGER_PRINCIPAL" : "yarn/_HOST@EXAMPLE.COM",
"HIVE": {
"EMBEDDED": {
"PORT": 9083
},
"STANDALONE": {
"PORT": 10000
},
"DATABASE": "default",
"HIVE_PRINCIPAL": "hive/_HOST@EXAMPLE.COM"
},
"HBASE": {
"PORT": 2181
}
},
"AMAZON_EMR": {
"EMR_4_0_0": {
"NAMENODE_URI": "hdfs://localhost:8020",
"RESOURCE_MANAGER": "localhost:8032",
"HBASE": {
"PORT": 2181
}
},
"APACHE_2_4_0_EMR": {
"NAMENODE_URI": "hdfs://localhost:9000",
"RESOURCE_MANAGER": "localhost:9022",
"HBASE": {
"PORT": 2181
}
},
"APACHE_1_0_3_EMR": {
"NAMENODE_URI": "hdfs://localhost:9000",
"JOBTRACKER": "localhost:9001",
"HBASE": {
"PORT": 2181
}
},
"MapR_EMR": {
"NAMENODE_URI": "maprfs:///localhost:7222",
"JOBTRACKER": "localhost:9001",
"HBASE": {
"PORT": 5181
}
},
"RESOURCEMANAGER_SCHEDULER_ADDRESS": "localhost:8030",
"JOBHISTORY_ADDRESS": "0.0.0.0:10020",
"STAGING_DIRECTORY": "/user",
"NAMENODE_PRINCIPAL": "nn/_HOST@EXAMPLE.COM",
"JOBTRACKER_PRINCIPAL" : "mapred/_HOST@EXAMPLE.COM",
"RESOURCE_MANAGER_PRINCIPAL" : "yarn/_HOST@EXAMPLE.COM",
"HIVE": {
"EMBEDDED": {
"PORT": 9083
},
"STANDALONE": {
"PORT": 10004
},
"DATABASE": "default",
"HIVE_PRINCIPAL": "hive/_HOST@EXAMPLE.COM"
}
},
"PIVOTAL_HD": {
"NAMENODE_URI": "hdfs://localhost:8020",
"JOBTRACKER": "localhost:8032",
"RESOURCE_MANAGER": "localhost:8032",
"RESOURCEMANAGER_SCHEDULER_ADDRESS": "localhost:8030",
"JOBHISTORY_ADDRESS": "0.0.0.0:10020",
"STAGING_DIRECTORY": "/user",
"NAMENODE_PRINCIPAL": "nn/_HOST@EXAMPLE.COM",
"JOBTRACKER_PRINCIPAL" : "mapred/_HOST@EXAMPLE.COM",
"RESOURCE_MANAGER_PRINCIPAL" : "yarn/_HOST@EXAMPLE.COM",
"JOBHISTORY_PRINCIPAL" : "mapred/_HOST@EXAMPLE.COM",
"HIVE": {
"EMBEDDED": {
"PORT": 9083
},
"STANDALONE": {
"PORT": 10000
},
"DATABASE": "default",
"HIVE_PRINCIPAL": "hive/_HOST@EXAMPLE.COM"
},
"HBASE": {
"PORT": 2181
}
},
"CUSTOM": {
"NAMENODE_URI": "hdfs://localhost:8020",
"JOBTRACKER": "localhost:50300",
"RESOURCE_MANAGER": "localhost:8032",
"RESOURCEMANAGER_SCHEDULER_ADDRESS": "localhost:8030",
"JOBHISTORY_ADDRESS": "0.0.0.0:10020",
"STAGING_DIRECTORY": "/user",
"NAMENODE_PRINCIPAL": "nn/_HOST@EXAMPLE.COM",
"JOBTRACKER_PRINCIPAL" : "mapred/_HOST@EXAMPLE.COM",
"RESOURCE_MANAGER_PRINCIPAL" : "yarn/_HOST@EXAMPLE.COM",
"HIVE": {
"EMBEDDED": {
"PORT": 9083
},
"STANDALONE": {
"PORT": 10000
},
"DATABASE": "default",
"HIVE_PRINCIPAL": "hive/_HOST@EXAMPLE.COM"
},
"HBASE": {
"PORT": 2181
}
}
}}

View File

@@ -34,8 +34,7 @@ import org.talend.core.ILibraryManagerService;
import org.talend.core.database.conn.ConnParameterKeys;
import org.talend.core.model.general.Project;
import org.talend.core.model.metadata.IMetadataConnection;
import org.talend.core.runtime.hd.IHDistribution;
import org.talend.core.runtime.hd.hive.HiveMetadataHelper;
import org.talend.core.model.metadata.connection.hive.HiveConnUtils;
import org.talend.repository.ProjectManager;
import org.talend.utils.io.FilesUtils;
@@ -44,21 +43,21 @@ import org.talend.utils.io.FilesUtils;
*/
public class ClassLoaderFactory {
public final static String EXTENSION_POINT_ID = "org.talend.core.runtime.classloader_provider"; //$NON-NLS-1$
private final static String EXTENSION_POINT_ID = "org.talend.core.runtime.classloader_provider"; //$NON-NLS-1$
private static IConfigurationElement[] configurationElements = null;
private static Map<String, DynamicClassLoader> classLoadersMap = null;
public final static String SEPARATOR = ";"; //$NON-NLS-1$
private final static String SEPARATOR = ";"; //$NON-NLS-1$
private final static String PATH_SEPARATOR = "/"; //$NON-NLS-1$
public final static String INDEX_ATTR = "index"; //$NON-NLS-1$
private final static String INDEX_ATTR = "index"; //$NON-NLS-1$
public final static String LIB_ATTR = "libraries"; //$NON-NLS-1$
private final static String LIB_ATTR = "libraries"; //$NON-NLS-1$
public final static String PARENT_ATTR = "parent"; //$NON-NLS-1$
private final static String PARENT_ATTR = "parent"; //$NON-NLS-1$
static {
IExtensionRegistry registry = Platform.getExtensionRegistry();
@@ -167,67 +166,44 @@ public class ClassLoaderFactory {
classLoadersMap = new ConcurrentHashMap<String, DynamicClassLoader>();
}
public static IConfigurationElement findIndex(String index) {
if (StringUtils.isNotEmpty(index) && configurationElements != null) {
private static synchronized DynamicClassLoader findLoader(String index, ClassLoader parentLoader,
boolean showDownloadIfNotExist) {
if (index != null && configurationElements != null) {
for (IConfigurationElement current : configurationElements) {
String key = current.getAttribute(INDEX_ATTR);
if (index.equals(key)) {
return current;
String libraries = current.getAttribute(LIB_ATTR);
if (StringUtils.isNotEmpty(index)) {
DynamicClassLoader classLoader = null;
ClassLoader parentClassLoader = null;
String parentKey = current.getAttribute(PARENT_ATTR);
// take parent classlaoder in extensions first
if (StringUtils.isNotEmpty(parentKey)) {
parentClassLoader = getClassLoader(parentKey, showDownloadIfNotExist);
}
if (parentClassLoader == null) {
parentClassLoader = parentLoader;
}
if (parentClassLoader == null) {
classLoader = new DynamicClassLoader();
} else {
classLoader = new DynamicClassLoader(parentClassLoader);
}
boolean putInCache = true;
if (StringUtils.isNotEmpty(libraries)) {
String[] librariesArray = libraries.split(SEPARATOR);
putInCache = loadLibraries(classLoader, librariesArray, showDownloadIfNotExist);
}
if (putInCache) {
// if any libraries can't be retreived , do not put it in cache
classLoadersMap.put(index, classLoader);
}
return classLoader;
}
}
}
}
return null;
}
public static String[] getLibs(String index) {
IConfigurationElement current = findIndex(index);
return getLibs(current);
}
public static String[] getLibs(IConfigurationElement current) {
if (current != null) {
String libraries = current.getAttribute(LIB_ATTR);
if (StringUtils.isNotEmpty(libraries)) {
return libraries.split(SEPARATOR);
}
}
return new String[0];
}
private static synchronized DynamicClassLoader findLoader(String index, ClassLoader parentLoader,
boolean showDownloadIfNotExist) {
IConfigurationElement current = findIndex(index);
if (current != null) {
// String key = current.getAttribute(INDEX_ATTR);
// String libraries = current.getAttribute(LIB_ATTR);
String parentKey = current.getAttribute(PARENT_ATTR);
ClassLoader parentClassLoader = null;
// take parent classlaoder in extensions first
if (StringUtils.isNotEmpty(parentKey)) {
parentClassLoader = getClassLoader(parentKey, showDownloadIfNotExist);
}
if (parentClassLoader == null) {
parentClassLoader = parentLoader;
}
DynamicClassLoader classLoader = null;
if (parentClassLoader == null) {
classLoader = new DynamicClassLoader();
} else {
classLoader = new DynamicClassLoader(parentClassLoader);
}
boolean putInCache = true;
String[] librariesArray = getLibs(current);
if (librariesArray.length > 0) {
putInCache = loadLibraries(classLoader, librariesArray, showDownloadIfNotExist);
}
if (putInCache) {
// if any libraries can't be retreived , do not put it in cache
classLoadersMap.put(index, classLoader);
}
return classLoader;
}
return null;
}
@@ -299,9 +275,7 @@ public class ClassLoaderFactory {
String distroKey = (String) metadataConn.getParameter(ConnParameterKeys.CONN_PARA_KEY_HIVE_DISTRIBUTION);
String distroVersion = (String) metadataConn.getParameter(ConnParameterKeys.CONN_PARA_KEY_HIVE_VERSION);
String hiveModel = (String) metadataConn.getParameter(ConnParameterKeys.CONN_PARA_KEY_HIVE_MODE);
IHDistribution distribution = HiveMetadataHelper.getDistribution(distroKey, false);
if (distribution != null && distribution.useCustom()) {
if (HiveConnUtils.isCustomDistro(distroKey)) {
String jarsStr = (String) metadataConn.getParameter(ConnParameterKeys.CONN_PARA_KEY_HADOOP_CUSTOM_JARS);
moduleList = jarsStr.split(";"); //$NON-NLS-1$
} else {

View File

@@ -59,7 +59,7 @@ public enum EDatabase4DriverClassName {
ORACLE_CUSTOM(EDatabaseTypeName.ORACLE_CUSTOM, "oracle.jdbc.OracleDriver", "oracle.jdbc.driver.OracleDriver"), //$NON-NLS-1$ //$NON-NLS-2$
PARACCEL(EDatabaseTypeName.PARACCEL, "com.paraccel.Driver"), //$NON-NLS-1$
REDSHIFT(EDatabaseTypeName.REDSHIFT, "com.amazon.redshift.jdbc41.Driver"), //$NON-NLS-1$
REDSHIFT(EDatabaseTypeName.REDSHIFT, "com.paraccel.Driver"), //$NON-NLS-1$
// Take care, PSQL is set as first here since actually the audit will take the first db with the postgresql driver
// if change the order, it might break the audit for PSQL.

View File

@@ -23,7 +23,7 @@ import org.talend.core.database.conn.template.DbConnStrForHive;
import org.talend.core.database.conn.template.EDatabaseConnTemplate;
import org.talend.core.database.conn.version.EDatabaseVersion4Drivers;
import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
import org.talend.core.model.metadata.connection.hive.HiveModeInfo;
import org.talend.core.model.metadata.connection.hive.HiveConnVersionInfo;
import org.talend.core.model.utils.ContextParameterUtils;
import org.talend.core.utils.TalendQuoteUtils;
@@ -191,16 +191,15 @@ public class DatabaseConnStrUtil {
}
// DbConnStrForHive.URL_HIVE_2_TEMPLATE or DbConnStrForHive.URL_HIVE_1_TEMPLATE
// set a default
boolean isEmbedded = (HiveModeInfo.get(hiveModel) == HiveModeInfo.EMBEDDED);
String url = null;
if (template.startsWith(DbConnStrForHive.URL_HIVE_2_TEMPLATE)) {
if (isEmbedded) {
if (HiveConnVersionInfo.MODE_EMBEDDED.getKey().equalsIgnoreCase(hiveModel)) {
url = getHive2EmbeddedURLString();
} else {
url = getHive2StandaloneURLString(false, server, port, sidOrDatabase, hivePrincipal);
}
} else if (template.startsWith(DbConnStrForHive.URL_HIVE_1_TEMPLATE)) {
if (isEmbedded) {
if (HiveConnVersionInfo.MODE_EMBEDDED.getKey().equalsIgnoreCase(hiveModel)) {
url = getHive1EmbeddedURLString();
} else {
url = getHive1StandaloneURLString(false, server, port, sidOrDatabase);

View File

@@ -81,7 +81,7 @@ public enum EDatabaseConnTemplate {
"jdbc:odbc:<datasource>")), //$NON-NLS-1$
ACCESS(new DbConnStr(EDatabaseTypeName.ACCESS, //
"jdbc:ucanaccess://<filename>;<property>",null,"memory=false")), //$NON-NLS-1$
"jdbc:ucanaccess://<filename>")), //$NON-NLS-1$
SYBASEASE(new DbConnStr(EDatabaseTypeName.SYBASEASE, //
"jdbc:sybase:Tds:<host>:<port>/<sid>?<property>", //$NON-NLS-1$
@@ -165,7 +165,7 @@ public enum EDatabaseConnTemplate {
"5439")), //$NON-NLS-1$
REDSHIFT(new DbConnStr(EDatabaseTypeName.REDSHIFT, //
"jdbc:redshift://<host>:<port>/<sid>", //$NON-NLS-1$
"jdbc:paraccel://<host>:<port>/<sid>", //$NON-NLS-1$
"5439")), //$NON-NLS-1$
NETEZZA(new DbConnStr(EDatabaseTypeName.NETEZZA, //
@@ -357,7 +357,6 @@ public enum EDatabaseConnTemplate {
case TERADATA: // for feature 0013719
case VERTICA:
case EXASOL:
case ACCESS:
return true;
default:
}

View File

@@ -180,7 +180,7 @@ public enum EDatabaseVersion4Drivers {
"commons-codec-1.9.jar", "htrace-core-3.2.0-incubating.jar", "jackson-mapper-asl-1.8.8.jar",
"jackson-core-asl-1.8.8.jar", "jackson-jaxrs-1.8.8.jar", "jackson-xc-1.8.8.jar", "jersey-client-1.9.jar" })),
REDSHIFT(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT, "RedshiftJDBC41-1.1.13.1013.jar")), //$NON-NLS-1$
REDSHIFT(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT, "paraccel-jdbc.jar")), //$NON-NLS-1$
AMAZON_AURORA(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "mysql-connector-java-5.1.30-bin.jar")); //$NON-NLS-1$

View File

@@ -0,0 +1,208 @@
// ============================================================================
//
// Copyright (C) 2006-2016 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.database.hbase.conn.version;
import java.util.ArrayList;
import java.util.List;
import org.talend.core.hadoop.version.EHadoopVersion4Drivers;
/**
* DOC ycbai class global comment. Detailled comment
*/
public enum EHBaseDistribution4Versions {
HDP_2_3(EHBaseDistributions.HORTONWORKS, EHadoopVersion4Drivers.HDP_2_3.getVersionDisplay(), EHadoopVersion4Drivers.HDP_2_3
.getVersionValue()),
HDP_2_2(EHBaseDistributions.HORTONWORKS, EHadoopVersion4Drivers.HDP_2_2.getVersionDisplay(), EHadoopVersion4Drivers.HDP_2_2
.getVersionValue()),
HDP_2_1(EHBaseDistributions.HORTONWORKS, EHadoopVersion4Drivers.HDP_2_1.getVersionDisplay(), EHadoopVersion4Drivers.HDP_2_1
.getVersionValue()),
HDP_2_0(EHBaseDistributions.HORTONWORKS, EHadoopVersion4Drivers.HDP_2_0.getVersionDisplay(), EHadoopVersion4Drivers.HDP_2_0
.getVersionValue()),
HDP_1_3(EHBaseDistributions.HORTONWORKS, EHadoopVersion4Drivers.HDP_1_3.getVersionDisplay(), EHadoopVersion4Drivers.HDP_1_3
.getVersionValue()),
HDP_1_2(EHBaseDistributions.HORTONWORKS, EHadoopVersion4Drivers.HDP_1_2.getVersionDisplay(), EHadoopVersion4Drivers.HDP_1_2
.getVersionValue()),
APACHE_2_4_0_EMR(
EHBaseDistributions.AMAZON_EMR,
EHadoopVersion4Drivers.APACHE_2_4_0_EMR.getVersionDisplay(),
EHadoopVersion4Drivers.APACHE_2_4_0_EMR.getVersionValue()),
APACHE_1_0_3_EMR(
EHBaseDistributions.AMAZON_EMR,
EHadoopVersion4Drivers.APACHE_1_0_3_EMR.getVersionDisplay(),
EHadoopVersion4Drivers.APACHE_1_0_3_EMR.getVersionValue()),
APACHE_1_0_0(
EHBaseDistributions.APACHE,
EHadoopVersion4Drivers.APACHE_1_0_0.getVersionDisplay(),
EHadoopVersion4Drivers.APACHE_1_0_0.getVersionValue()),
CLOUDERA_CDH5_5(
EHBaseDistributions.CLOUDERA,
EHadoopVersion4Drivers.CLOUDERA_CDH5_5.getVersionDisplay(),
EHadoopVersion4Drivers.CLOUDERA_CDH5_5.getVersionValue()),
CLOUDERA_CDH5_4(
EHBaseDistributions.CLOUDERA,
EHadoopVersion4Drivers.CLOUDERA_CDH5_4.getVersionDisplay(),
EHadoopVersion4Drivers.CLOUDERA_CDH5_4.getVersionValue()),
CLOUDERA_CDH5_1(
EHBaseDistributions.CLOUDERA,
EHadoopVersion4Drivers.CLOUDERA_CDH5_1.getVersionDisplay(),
EHadoopVersion4Drivers.CLOUDERA_CDH5_1.getVersionValue()),
CLOUDERA_CDH5_1_MR1(
EHBaseDistributions.CLOUDERA,
EHadoopVersion4Drivers.CLOUDERA_CDH5_1_MR1.getVersionDisplay(),
EHadoopVersion4Drivers.CLOUDERA_CDH5_1_MR1.getVersionValue()),
CLOUDERA_CDH5(
EHBaseDistributions.CLOUDERA,
EHadoopVersion4Drivers.CLOUDERA_CDH5.getVersionDisplay(),
EHadoopVersion4Drivers.CLOUDERA_CDH5.getVersionValue()),
CLOUDERA_CDH4_YARN(
EHBaseDistributions.CLOUDERA,
EHadoopVersion4Drivers.CLOUDERA_CDH4_YARN.getVersionDisplay(),
EHadoopVersion4Drivers.CLOUDERA_CDH4_YARN.getVersionValue()),
CLOUDERA_CDH4(
EHBaseDistributions.CLOUDERA,
EHadoopVersion4Drivers.CLOUDERA_CDH4.getVersionDisplay(),
EHadoopVersion4Drivers.CLOUDERA_CDH4.getVersionValue()),
MAPR_5_0_0(EHBaseDistributions.MAPR, EHadoopVersion4Drivers.MAPR500.getVersionDisplay(), EHadoopVersion4Drivers.MAPR500
.getVersionValue()),
MAPR_4_1_0(EHBaseDistributions.MAPR, EHadoopVersion4Drivers.MAPR410.getVersionDisplay(), EHadoopVersion4Drivers.MAPR410
.getVersionValue()),
MAPR_4_0_1(EHBaseDistributions.MAPR, EHadoopVersion4Drivers.MAPR401.getVersionDisplay(), EHadoopVersion4Drivers.MAPR401
.getVersionValue()),
MAPR_3_1_0(EHBaseDistributions.MAPR, EHadoopVersion4Drivers.MAPR310.getVersionDisplay(), EHadoopVersion4Drivers.MAPR310
.getVersionValue()),
MAPR_3_0_1(EHBaseDistributions.MAPR, EHadoopVersion4Drivers.MAPR301.getVersionDisplay(), EHadoopVersion4Drivers.MAPR301
.getVersionValue()),
MAPR_2_1_3(EHBaseDistributions.MAPR, EHadoopVersion4Drivers.MAPR213.getVersionDisplay(), EHadoopVersion4Drivers.MAPR213
.getVersionValue()),
MAPR_2_1_2(EHBaseDistributions.MAPR, EHadoopVersion4Drivers.MAPR212.getVersionDisplay(), EHadoopVersion4Drivers.MAPR212
.getVersionValue()),
MAPR(EHBaseDistributions.MAPR, EHadoopVersion4Drivers.MAPR2.getVersionDisplay(), EHadoopVersion4Drivers.MAPR2
.getVersionValue()),
PIVOTAL_HD_2_0(
EHBaseDistributions.PIVOTAL_HD,
EHadoopVersion4Drivers.PIVOTAL_HD_2_0.getVersionDisplay(),
EHadoopVersion4Drivers.PIVOTAL_HD_2_0.getVersionValue()),
PIVOTAL_HD_1_0_1(
EHBaseDistributions.PIVOTAL_HD,
EHadoopVersion4Drivers.PIVOTAL_HD_1_0_1.getVersionDisplay(),
EHadoopVersion4Drivers.PIVOTAL_HD_1_0_1.getVersionValue()),
CUSTOM(EHBaseDistributions.CUSTOM, EHadoopVersion4Drivers.CUSTOM.getVersionDisplay(), EHadoopVersion4Drivers.CUSTOM
.getVersionValue());
private EHBaseDistributions distribution;
private String versionDisplayName;
private String versionValue;
EHBaseDistribution4Versions(EHBaseDistributions distribution, String versionDisplayName, String versionValue) {
this.distribution = distribution;
this.versionDisplayName = versionDisplayName;
this.versionValue = versionValue;
}
public static List<EHBaseDistribution4Versions> indexOfByDistribution(String distribution) {
List<EHBaseDistribution4Versions> distribution4Versions = new ArrayList<EHBaseDistribution4Versions>();
if (distribution != null) {
for (EHBaseDistribution4Versions d4v : EHBaseDistribution4Versions.values()) {
if (d4v.getDistribution().getName().equals(distribution)
|| d4v.getDistribution().getDisplayName().equals(distribution)) {
distribution4Versions.add(d4v);
}
}
}
return distribution4Versions;
}
public static EHBaseDistribution4Versions indexOfByVersionDisplay(String displayName) {
return indexOf(displayName, true);
}
public static EHBaseDistribution4Versions indexOfByVersion(String value) {
return indexOf(value, false);
}
private static EHBaseDistribution4Versions indexOf(String name, boolean display) {
if (name != null) {
for (EHBaseDistribution4Versions version : EHBaseDistribution4Versions.values()) {
if (display) {
if (name.equalsIgnoreCase(version.getVersionDisplayName())) {
return version;
}
} else {
if (name.equalsIgnoreCase(version.getVersionValue())) {
return version;
}
}
}
}
return null;
}
public static List<String> getHadoopDistributionVersions(String distribution) {
return getHadoopDistributionVersions(distribution, true);
}
public static List<String> getHadoopDistributionVersions(String distribution, boolean display) {
List<String> result = new ArrayList<String>();
List<EHBaseDistribution4Versions> d4vList = EHBaseDistribution4Versions.indexOfByDistribution(distribution);
for (EHBaseDistribution4Versions d4v : d4vList) {
if (display) {
result.add(d4v.getVersionDisplayName());
} else {
result.add(d4v.getVersionValue());
}
}
return result;
}
public EHBaseDistributions getDistribution() {
return this.distribution;
}
public String getVersionDisplayName() {
return this.versionDisplayName;
}
public String getVersionValue() {
return this.versionValue;
}
}

View File

@@ -0,0 +1,92 @@
// ============================================================================
//
// Copyright (C) 2006-2016 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.database.hbase.conn.version;
import java.util.ArrayList;
import java.util.List;
import org.talend.core.hadoop.version.EHadoopDistributions;
/**
* DOC ycbai class global comment. Detailled comment
*/
public enum EHBaseDistributions {
HORTONWORKS(EHadoopDistributions.HORTONWORKS.getDisplayName()),
CLOUDERA(EHadoopDistributions.CLOUDERA.getDisplayName()),
MAPR(EHadoopDistributions.MAPR.getDisplayName()),
APACHE(EHadoopDistributions.APACHE.getDisplayName()),
AMAZON_EMR(EHadoopDistributions.AMAZON_EMR.getDisplayName()),
PIVOTAL_HD(EHadoopDistributions.PIVOTAL_HD.getDisplayName()),
CUSTOM(EHadoopDistributions.CUSTOM.getDisplayName());
private String displayName;
EHBaseDistributions(String displayName) {
this.displayName = displayName;
}
public String getName() {
return name();
}
public String getDisplayName() {
return this.displayName;
}
public static List<String> getAllDistributionDisplayNames() {
return getAllDistributionNames(true);
}
public static List<String> getAllDistributionNames(boolean display) {
List<String> names = new ArrayList<String>();
EHBaseDistributions[] values = values();
for (EHBaseDistributions distribution : values) {
if (display) {
names.add(distribution.getDisplayName());
} else {
names.add(distribution.getName());
}
}
return names;
}
public static EHBaseDistributions getDistributionByDisplayName(String name) {
return getDistributionByName(name, true);
}
public static EHBaseDistributions getDistributionByName(String name, boolean display) {
if (name != null) {
for (EHBaseDistributions distribution : values()) {
if (display) {
if (name.equalsIgnoreCase(distribution.getDisplayName())) {
return distribution;
}
} else {
if (name.equalsIgnoreCase(distribution.getName())) {
return distribution;
}
}
}
}
return null;
}
}

View File

@@ -32,8 +32,6 @@ public class HadoopConstants {
public static final String FRAMEWORK_STORM = "Storm";
public static final String FRAMEWORK_SPARKSTREAMING = "Spark Streaming";
public static final String FRAMEWORK_SPARK_STREAMING = "Spark_Streaming";
public static final String FRAMEWORK_MAPREDUCE = "MapReduce";
@@ -42,10 +40,6 @@ public class HadoopConstants {
public static final String JOBTYPEBDSTREAMING = "Big Data Streaming";
public static final String JOBTYPEBDBATCH = "Big Data Batch";
public static final String JOBTYPE_BDSTREAMING = "Big_Data_Streaming";
public static final String JOBTYPE_BDBATCH = "Big_Data_Batch";
public static final String SPARKSTREAMING_TYPE = "SPARKSTREAMING";

View File

@@ -20,7 +20,6 @@ import org.talend.commons.exception.BusinessException;
import org.talend.commons.exception.PersistenceException;
import org.talend.core.IService;
import org.talend.core.model.general.ModuleNeeded;
import org.talend.core.model.general.Project;
import org.talend.core.model.metadata.builder.connection.Connection;
import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
import org.talend.core.model.process.IProcess;
@@ -151,8 +150,6 @@ public interface IHadoopClusterService extends IService {
public Item getHadoopClusterBySubitemId(String subItemId);
public Item getHadoopClusterBySubitemId(Project project, String subItemId);
/**
* DOC ycbai Comment method "refreshCluster".
*
@@ -219,8 +216,6 @@ public interface IHadoopClusterService extends IService {
*/
public boolean hasDiffsFromClusterToProcess(Item item, IProcess process);
public Connection getHadoopClusterConnectionBySubConnection(Connection hadoopSubConnection);
public String getHadoopClusterProperties(Connection hadoopSubConnection);
/**
@@ -234,23 +229,5 @@ public interface IHadoopClusterService extends IService {
public String getCustomConfsJarName(String clusterId);
public void useCustomConfsJarIfNeeded(List<ModuleNeeded> modulesNeeded, String clusterId);
public boolean useClouderaNavi(Connection hadoopSubConnection);
public String getClouderaNaviUserName(Connection hadoopSubConnection);
public String getClouderaNaviPassword(Connection hadoopSubConnection);
public String getClouderaNaviUrl(Connection hadoopSubConnection);
public String getClouderaNaviMetadataUrl(Connection hadoopSubConnection);
public String getClouderaNaviClientUrl(Connection hadoopSubConnection);
public boolean clouderaNaviAutoCommit(Connection hadoopSubConnection);
public boolean clouderaNaviDisableSSL(Connection hadoopSubConnection);
public boolean clouderaNaviDieOnError(Connection hadoopSubConnection);
}

View File

@@ -12,97 +12,18 @@
// ============================================================================
package org.talend.core.hadoop;
import java.util.Map;
import org.talend.core.IService;
import org.talend.core.runtime.hd.IDistributionsManager;
import org.talend.core.runtime.hd.IHDistribution;
import org.talend.core.runtime.hd.IHDistributionVersion;
import org.talend.core.hadoop.version.EHadoopVersion4Drivers;
/**
* created by cmeng on Jan 15, 2016 Detailled comment
* created by cmeng on Jan 15, 2016
* Detailled comment
*
*/
public interface IHadoopDistributionService extends IService {
/**
*
* According to the service, find the distributions. The service is name of HadoopComponent service.
* {@link org.talend.hadoop.distribution.component.HadoopComponent}.
*/
IHDistribution[] getDistributions(String service);
/**
* Check the distribution version support the service or not.
*
* The service must be full name, and be sub class of
* {@link org.talend.hadoop.distribution.component.HadoopComponent)
*/
boolean doSupportService(IHDistributionVersion distributionVersion, String service);
/**
* Check the boolean methods for sub class of {@link org.talend.hadoop.distribution.component.HadoopComponent)
*
* If no the method in the HadoopComponent object, won't contain in the result map.
*/
Map<String, Boolean> doSupportMethods(IHDistributionVersion distributionVersion, String... methods) throws Exception;
boolean doSupportMethod(IHDistributionVersion distributionVersion, String method) throws Exception;
/**
* Find the matched distribution via name.
*
* If the display is true, the name match for display one of distribution.
*/
IHDistribution getHadoopDistribution(String name, boolean byDisplay);
/**
* Find the matched distribution via version .
*
* If the display is true, the version match for display one of distribution.
*/
IHDistributionVersion getHadoopDistributionVersion(String version, boolean byDisplay);
/**
*
* for Hadoop Distribution {@link HadoopComponent}.
*/
IDistributionsManager getHadoopDistributionManager();
/**
*
* for MapReduce Distribution {@link MRComponent}.
*/
IDistributionsManager getMapReduceDistributionManager();
/**
*
* for HBase in Database wizard.{@link HBaseComponent}.
*/
IDistributionsManager getHBaseDistributionManager();
/**
*
* for Spark Streaming Distribution {@link SparkStreamingComponent}.
*/
IDistributionsManager getSparkStreamingDistributionManager();
/**
*
* for Spark Batch Distribution {@link SparkBatchComponent}.
*/
IDistributionsManager getSparkBatchDistributionManager();
/**
*
* for Hive Distribution {@link HiveComponent}.
*/
IDistributionsManager getHiveDistributionManager();
/**
*
* Temp for Oozie.
*/
IHDistribution[] getOozieDistributions();
public boolean isSupportSpark(EHadoopVersion4Drivers version);
public boolean isSupportSparkStreaming(EHadoopVersion4Drivers version);
}

View File

@@ -32,8 +32,6 @@ public enum EHadoopConfProperties {
RESOURCEMANAGER_SCHEDULER("yarn.resourcemanager.scheduler.address", "localhost:8030"), //$NON-NLS-1$ //$NON-NLS-2$
RESOURCEMANAGER_SCHEDULER_ADDRESS_RM_ID("yarn.resourcemanager.scheduler.address.%s", ""), //$NON-NLS-1$ //$NON-NLS-2$
JOBHISTORY("mapreduce.jobhistory.address", "localhost:10020"), //$NON-NLS-1$ //$NON-NLS-2$
STAGING_DIR("yarn.app.mapreduce.am.staging-dir", "/user"), //$NON-NLS-1$ //$NON-NLS-2$

View File

@@ -45,16 +45,6 @@ public enum EHadoopProperties {
DATABASE,
PORT,
CLOUDERA_NAVIGATOR_USERNAME,
CLOUDERA_NAVIGATOR_PASSWORD,
CLOUDERA_NAVIGATOR_URL,
CLOUDERA_NAVIGATOR_METADATA_URL,
CLOUDERA_NAVIGATOR_CLIENT_URL,
;

View File

@@ -0,0 +1,42 @@
// ============================================================================
//
// Copyright (C) 2006-2016 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.conf;
import org.talend.core.runtime.conf.DefaultConfsManager;
/**
* created by ycbai on Jul 31, 2014 Detailled comment
*
*/
public class HadoopDefaultConfsManager extends DefaultConfsManager {
private final static String CONF_FILE_PATH = "resources/hadoop/hadoop_default_confs.json"; //$NON-NLS-1$
private final static String ROOT_ELEMENT = "HADOOP"; //$NON-NLS-1$
private static HadoopDefaultConfsManager manager = new HadoopDefaultConfsManager(CONF_FILE_PATH);
private HadoopDefaultConfsManager(String confFilePath) {
super(CONF_FILE_PATH);
}
public static synchronized final HadoopDefaultConfsManager getInstance() {
return manager;
}
@Override
protected String getRootElement() {
return ROOT_ELEMENT;
}
}

View File

@@ -23,9 +23,7 @@ import org.talend.commons.exception.ExceptionHandler;
import org.talend.core.GlobalServiceRegister;
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.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;
@@ -141,11 +139,8 @@ public class HadoopRepositoryUtil {
}
List<Map<String, Object>> parentProperties = null;
if (hadoopClusterService != null) {
Connection hadoopClusterConnection = hadoopClusterService.getHadoopClusterConnectionBySubConnection(connection);
if (hadoopClusterConnection != null) {
parentProperties = getHadoopPropertiesList(hadoopClusterService.getHadoopClusterProperties(connection),
hadoopClusterConnection.isContextMode(), true);
}
parentProperties = getHadoopPropertiesList(hadoopClusterService.getHadoopClusterProperties(connection),
connection.isContextMode(), true);
}
List<Map<String, Object>> properties = getHadoopPropertiesList(propertiesJsonStr, connection.isContextMode(), true);
Map<String, Map<String, Object>> propertiesMap = new HashMap<String, Map<String, Object>>();
@@ -165,145 +160,5 @@ public class HadoopRepositoryUtil {
return properties;
}
public static boolean useClouderaNavi(Connection hadoopSubConnection) {
IHadoopClusterService hadoopClusterService = null;
if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopClusterService.class)) {
hadoopClusterService = (IHadoopClusterService) GlobalServiceRegister.getDefault().getService(
IHadoopClusterService.class);
}
if(hadoopClusterService!=null){
return hadoopClusterService.useClouderaNavi(hadoopSubConnection);
}
return false;
}
public static String getClouderaNaviUserName(Connection hadoopSubConnection) {
IHadoopClusterService hadoopClusterService = null;
if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopClusterService.class)) {
hadoopClusterService = (IHadoopClusterService) GlobalServiceRegister.getDefault().getService(
IHadoopClusterService.class);
}
if(hadoopClusterService!=null){
return hadoopClusterService.getClouderaNaviUserName(hadoopSubConnection);
}
return null;
}
public static String getClouderaNaviPassword(Connection hadoopSubConnection) {
IHadoopClusterService hadoopClusterService = null;
if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopClusterService.class)) {
hadoopClusterService = (IHadoopClusterService) GlobalServiceRegister.getDefault().getService(
IHadoopClusterService.class);
}
if(hadoopClusterService!=null){
return hadoopClusterService.getClouderaNaviPassword(hadoopSubConnection);
}
return null;
}
public static String getClouderaNaviUrl(Connection hadoopSubConnection) {
IHadoopClusterService hadoopClusterService = null;
if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopClusterService.class)) {
hadoopClusterService = (IHadoopClusterService) GlobalServiceRegister.getDefault().getService(
IHadoopClusterService.class);
}
if(hadoopClusterService!=null){
return hadoopClusterService.getClouderaNaviUrl(hadoopSubConnection);
}
return null;
}
public static String getClouderaNaviMetadataUrl(Connection hadoopSubConnection) {
IHadoopClusterService hadoopClusterService = null;
if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopClusterService.class)) {
hadoopClusterService = (IHadoopClusterService) GlobalServiceRegister.getDefault().getService(
IHadoopClusterService.class);
}
if(hadoopClusterService!=null){
return hadoopClusterService.getClouderaNaviMetadataUrl(hadoopSubConnection);
}
return null;
}
public static String getClouderaNaviClientUrl(Connection hadoopSubConnection) {
IHadoopClusterService hadoopClusterService = null;
if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopClusterService.class)) {
hadoopClusterService = (IHadoopClusterService) GlobalServiceRegister.getDefault().getService(
IHadoopClusterService.class);
}
if(hadoopClusterService!=null){
return hadoopClusterService.getClouderaNaviClientUrl(hadoopSubConnection);
}
return null;
}
public static boolean clouderaNaviAutoCommit(Connection hadoopSubConnection) {
IHadoopClusterService hadoopClusterService = null;
if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopClusterService.class)) {
hadoopClusterService = (IHadoopClusterService) GlobalServiceRegister.getDefault().getService(
IHadoopClusterService.class);
}
if(hadoopClusterService!=null){
return hadoopClusterService.clouderaNaviAutoCommit(hadoopSubConnection);
}
return false;
}
public static boolean clouderaNaviDisableSSL(Connection hadoopSubConnection) {
IHadoopClusterService hadoopClusterService = null;
if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopClusterService.class)) {
hadoopClusterService = (IHadoopClusterService) GlobalServiceRegister.getDefault().getService(
IHadoopClusterService.class);
}
if(hadoopClusterService!=null){
return hadoopClusterService.clouderaNaviDisableSSL(hadoopSubConnection);
}
return false;
}
public static boolean clouderaNaviDieOnError(Connection hadoopSubConnection) {
IHadoopClusterService hadoopClusterService = null;
if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopClusterService.class)) {
hadoopClusterService = (IHadoopClusterService) GlobalServiceRegister.getDefault().getService(
IHadoopClusterService.class);
}
if(hadoopClusterService!=null){
return hadoopClusterService.clouderaNaviDieOnError(hadoopSubConnection);
}
return false;
}
public static String getOriginalValueOfProperties(ContextType contextType, String propertiesStrings) {
String originalValueOfProperties = propertiesStrings;
if (propertiesStrings != null && !propertiesStrings.isEmpty()) {
List<Map<String, Object>> jdbcPropertiesList = HadoopRepositoryUtil.getHadoopPropertiesList(propertiesStrings);
if (jdbcPropertiesList != null && !jdbcPropertiesList.isEmpty()) {
List<Map<String, Object>> newJdbcPropertiesList = new ArrayList<Map<String, Object>>(jdbcPropertiesList.size());
Iterator<Map<String, Object>> iter = jdbcPropertiesList.iterator();
while (iter.hasNext()) {
Map<String, Object> map = iter.next();
if (map != null && !map.isEmpty()) {
Map<String, Object> newMap = new HashMap<String, Object>();
Iterator<Map.Entry<String, Object>> mapEntryIter = map.entrySet().iterator();
while (mapEntryIter.hasNext()) {
Map.Entry<String, Object> entry = mapEntryIter.next();
if (entry != null) {
Object obj = entry.getValue();
Object newValue = null;
if (obj != null) {
newValue = ContextParameterUtils.getOriginalValue(contextType, obj.toString());
}
newMap.put(entry.getKey(), newValue);
}
}
newJdbcPropertiesList.add(newMap);
}
}
originalValueOfProperties = HadoopRepositoryUtil.getHadoopPropertiesJsonStr(newJdbcPropertiesList);
}
}
return originalValueOfProperties;
}
}

View File

@@ -12,10 +12,11 @@
// ============================================================================
package org.talend.core.hadoop.version;
import java.util.ArrayList;
import java.util.List;
/**
* DOC ycbai class global comment. Detailled comment
*
* @deprecated @link HadoopComponent via osgi service instead.
*/
public enum EHadoopDistributions {
@@ -49,6 +50,28 @@ public enum EHadoopDistributions {
return this.displayName;
}
public static List<String> getAllDistributionDisplayNames() {
return getAllDistributionNames(true);
}
public static List<String> getAllDistributionNames(boolean display) {
List<String> names = new ArrayList<String>();
EHadoopDistributions[] values = values();
for (EHadoopDistributions distribution : values) {
if (display) {
names.add(distribution.getDisplayName());
} else {
names.add(distribution.getName());
}
}
return names;
}
public static EHadoopDistributions getDistributionByDisplayName(String name) {
return getDistributionByName(name, true);
}
public static EHadoopDistributions getDistributionByName(String name, boolean display) {
if (name != null) {
for (EHadoopDistributions distribution : values()) {

View File

@@ -16,11 +16,12 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.ArrayUtils;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.hadoop.IHadoopDistributionService;
/**
* DOC ycbai class global comment. Detailled comment
*
* @deprecated @link HadoopComponent via osgi service instead.
*/
public enum EHadoopVersion4Drivers {
@@ -244,4 +245,15 @@ public enum EHadoopVersion4Drivers {
return ArrayUtils.contains(getMrVersions(), EMRVersion.YARN);
}
public boolean isSupportSpark() {
boolean isSupport = false;
if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopDistributionService.class)) {
IHadoopDistributionService hadoopDistributionService = (IHadoopDistributionService) GlobalServiceRegister.getDefault()
.getService(IHadoopDistributionService.class);
isSupport = hadoopDistributionService.isSupportSpark(this);
} else {
ExceptionHandler.process(new Exception(IHadoopDistributionService.class.getName() + " is not registed.")); //$NON-NLS-1$
}
return isSupport;
}
}

View File

@@ -18,13 +18,12 @@ import java.util.List;
/**
* created by ycbai on 2013-9-16 Detailled comment
*
* @deprecated @link EHadoopVersion instead.
*/
public enum EMRVersion {
MR1, // EHadoopVersion.HADOOP_1
MR1,
YARN, // EHadoopVersion.HADOOP_2
YARN,
;

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