Compare commits
1 Commits
release/6.
...
bugfix/6.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
a90fd45b80 |
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -123,11 +123,4 @@
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.apache.xerces"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
</feature>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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;
|
||||
@@ -93,8 +92,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 +216,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;
|
||||
@@ -422,6 +417,4 @@ public interface IRepositoryFactory {
|
||||
public String getStorage();
|
||||
|
||||
public JSONArray getAllRemoteLocks();
|
||||
|
||||
public void loadProjectAndSetContext(IProject eclipseProject) throws PersistenceException;
|
||||
}
|
||||
|
||||
@@ -252,11 +252,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
|
||||
return this.repositoryFactoryFromProvider;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getXmiResourceManager() {
|
||||
return getRepositoryFactoryFromProvider().getResourceManager();
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
@@ -532,7 +527,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 +678,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 +805,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 +1479,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 +2023,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
|
||||
this.repositoryFactoryFromProvider.executeRepositoryWorkUnit(workUnit);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void unloadResources(Property property) throws PersistenceException {
|
||||
repositoryFactoryFromProvider.unloadResources(property);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -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,26 @@ 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.GENERATED) {
|
||||
return true;
|
||||
}
|
||||
if (node.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.METADATA_CON_CDC) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -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,13 +50,11 @@ 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;
|
||||
@@ -184,20 +180,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 +247,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 +272,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);
|
||||
}
|
||||
@@ -335,10 +300,10 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
|
||||
imageDesc = ImageUtils.scale(imageDesc, ICON_SIZE.ICON_32);
|
||||
String md5Desc = MD5.getMD5(item.getIcon().getInnerContent());
|
||||
image = cachedImages.get(md5Desc);
|
||||
|
||||
|
||||
if (image == null || image.isDisposed()) {
|
||||
image = imageDesc.createImage();
|
||||
cachedImages.put(md5Desc, image);
|
||||
cachedImages.put(md5Desc, image);
|
||||
} else {
|
||||
// image = imageDesc.createImage();
|
||||
}
|
||||
@@ -361,16 +326,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) {
|
||||
|
||||
@@ -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,6 @@ 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.model.process.IElementParameter;
|
||||
import org.talend.core.model.process.IProcess;
|
||||
import org.talend.core.model.properties.Item;
|
||||
@@ -369,18 +365,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 +420,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 +473,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".
|
||||
|
||||
@@ -52,6 +52,7 @@ Export-Package: org.talend.commons.utils.generation,
|
||||
org.talend.core.prefs,
|
||||
org.talend.core.repository,
|
||||
org.talend.core.runtime,
|
||||
org.talend.core.runtime.conf,
|
||||
org.talend.core.runtime.hd,
|
||||
org.talend.core.runtime.hd.hive,
|
||||
org.talend.core.runtime.maven,
|
||||
@@ -119,4 +120,3 @@ Bundle-ClassPath: .,
|
||||
lib/resty-0.3.2.jar,
|
||||
lib/json_simple-1.1.jar
|
||||
Eclipse-RegisterBuddy: org.talend.testutils
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
|
||||
@@ -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,\
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -0,0 +1,221 @@
|
||||
{"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",
|
||||
"CLOUDERA_NAVIGATOR_USERNAME": "username",
|
||||
"CLOUDERA_NAVIGATOR_PASSWORD": "",
|
||||
"CLOUDERA_NAVIGATOR_URL": "http://localhost:7187/api/v8/",
|
||||
"CLOUDERA_NAVIGATOR_METADATA_URL": "http://localhost:7187/api/v8/metadata/plugin",
|
||||
"CLOUDERA_NAVIGATOR_CLIENT_URL": "http://localhost",
|
||||
"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",
|
||||
"CLOUDERA_NAVIGATOR_USERNAME": "username",
|
||||
"CLOUDERA_NAVIGATOR_PASSWORD": "",
|
||||
"CLOUDERA_NAVIGATOR_URL": "http://localhost:7187/api/v8/",
|
||||
"CLOUDERA_NAVIGATOR_METADATA_URL": "http://localhost:7187/api/v8/metadata/plugin",
|
||||
"CLOUDERA_NAVIGATOR_CLIENT_URL": "http://localhost",
|
||||
"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",
|
||||
"CLOUDERA_NAVIGATOR_USERNAME": "username",
|
||||
"CLOUDERA_NAVIGATOR_PASSWORD": "",
|
||||
"CLOUDERA_NAVIGATOR_URL": "http://localhost:7187/api/v8/",
|
||||
"CLOUDERA_NAVIGATOR_METADATA_URL": "http://localhost:7187/api/v8/metadata/plugin",
|
||||
"CLOUDERA_NAVIGATOR_CLIENT_URL": "http://localhost",
|
||||
"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",
|
||||
"CLOUDERA_NAVIGATOR_USERNAME": "username",
|
||||
"CLOUDERA_NAVIGATOR_PASSWORD": "",
|
||||
"CLOUDERA_NAVIGATOR_URL": "http://localhost:7187/api/v8/",
|
||||
"CLOUDERA_NAVIGATOR_METADATA_URL": "http://localhost:7187/api/v8/metadata/plugin",
|
||||
"CLOUDERA_NAVIGATOR_CLIENT_URL": "http://localhost",
|
||||
"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",
|
||||
"CLOUDERA_NAVIGATOR_USERNAME": "username",
|
||||
"CLOUDERA_NAVIGATOR_PASSWORD": "",
|
||||
"CLOUDERA_NAVIGATOR_URL": "http://localhost:7187/api/v8/",
|
||||
"CLOUDERA_NAVIGATOR_METADATA_URL": "http://localhost:7187/api/v8/metadata/plugin",
|
||||
"CLOUDERA_NAVIGATOR_CLIENT_URL": "http://localhost",
|
||||
"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",
|
||||
"CLOUDERA_NAVIGATOR_USERNAME": "username",
|
||||
"CLOUDERA_NAVIGATOR_PASSWORD": "",
|
||||
"CLOUDERA_NAVIGATOR_URL": "http://localhost:7187/api/v8/",
|
||||
"CLOUDERA_NAVIGATOR_METADATA_URL": "http://localhost:7187/api/v8/metadata/plugin",
|
||||
"CLOUDERA_NAVIGATOR_CLIENT_URL": "http://localhost",
|
||||
"HIVE": {
|
||||
"EMBEDDED": {
|
||||
"PORT": 9083
|
||||
},
|
||||
"STANDALONE": {
|
||||
"PORT": 10000
|
||||
},
|
||||
"DATABASE": "default",
|
||||
"HIVE_PRINCIPAL": "hive/_HOST@EXAMPLE.COM"
|
||||
},
|
||||
"HBASE": {
|
||||
"PORT": 2181
|
||||
}
|
||||
}
|
||||
}}
|
||||
@@ -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.
|
||||
|
||||
@@ -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, //
|
||||
|
||||
@@ -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$
|
||||
|
||||
|
||||
@@ -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".
|
||||
*
|
||||
@@ -234,23 +231,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);
|
||||
|
||||
}
|
||||
|
||||
@@ -69,34 +69,22 @@ public interface IHadoopDistributionService extends IService {
|
||||
*/
|
||||
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 getSparkDistributionManager();
|
||||
|
||||
/**
|
||||
*
|
||||
* for Spark Distribution {@link SparkComponent}.
|
||||
*/
|
||||
IDistributionsManager getHiveDistributionManager();
|
||||
|
||||
/**
|
||||
|
||||
@@ -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$
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
@@ -165,145 +163,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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,6 +24,12 @@ import org.apache.commons.lang.ArrayUtils;
|
||||
*/
|
||||
public enum EHadoopVersion4Drivers {
|
||||
|
||||
HDP_2_4(EHadoopDistributions.HORTONWORKS, "Hortonworks Data Platform V2.4.0", //$NON-NLS-1$
|
||||
"HDP_2_4", //$NON-NLS-1$
|
||||
true,
|
||||
false,
|
||||
new EMRVersion[] { EMRVersion.YARN }),
|
||||
|
||||
HDP_2_3(EHadoopDistributions.HORTONWORKS, "Hortonworks Data Platform V2.3.0", //$NON-NLS-1$
|
||||
"HDP_2_3", //$NON-NLS-1$
|
||||
true,
|
||||
@@ -92,6 +98,8 @@ public enum EHadoopVersion4Drivers {
|
||||
|
||||
CLOUDERA_CDH4(EHadoopDistributions.CLOUDERA, "Cloudera CDH4.X(MR1 mode)", "Cloudera_CDH4", true, false), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
|
||||
MAPR510(EHadoopDistributions.MAPR, "MapR 5.1.0(YARN mode)", "MAPR510", true, true, new EMRVersion[] { EMRVersion.YARN }), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
|
||||
MAPR500(EHadoopDistributions.MAPR, "MapR 5.0.0(YARN mode)", "MAPR500", true, true, new EMRVersion[] { EMRVersion.YARN }), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
|
||||
MAPR410(EHadoopDistributions.MAPR, "MapR 4.1.0(YARN mode)", "MAPR410", false, true, new EMRVersion[] { EMRVersion.YARN }), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
@@ -114,6 +122,12 @@ public enum EHadoopVersion4Drivers {
|
||||
false,
|
||||
new EMRVersion[] { EMRVersion.YARN }),
|
||||
|
||||
EMR_4_5_0(EHadoopDistributions.AMAZON_EMR, "EMR 4.5.0 (Apache 2.7.2)", //$NON-NLS-1$
|
||||
"EMR_4_5_0", //$NON-NLS-1$
|
||||
false,
|
||||
false,
|
||||
new EMRVersion[] { EMRVersion.YARN }),
|
||||
|
||||
APACHE_2_4_0_EMR(EHadoopDistributions.AMAZON_EMR, "Apache 2.4.0", //$NON-NLS-1$
|
||||
"APACHE_2_4_0_EMR", //$NON-NLS-1$
|
||||
false,
|
||||
|
||||
@@ -19,11 +19,8 @@ import java.util.Set;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.eclipse.emf.common.util.EMap;
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
import org.talend.core.database.conn.ConnParameterKeys;
|
||||
import org.talend.core.hadoop.IHadoopDistributionService;
|
||||
import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
|
||||
import org.talend.core.runtime.hd.IDistributionsManager;
|
||||
|
||||
/**
|
||||
* Created by Marvin Wang on Mar 26, 2013.
|
||||
@@ -103,26 +100,4 @@ public class HadoopVersionControlUtils {
|
||||
|
||||
return customVersionMap;
|
||||
}
|
||||
|
||||
public static IDistributionsManager getDistributionsManager(ECustomVersionType type) {
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopDistributionService.class)) {
|
||||
IHadoopDistributionService hadoopDistributionService = (IHadoopDistributionService) GlobalServiceRegister
|
||||
.getDefault().getService(IHadoopDistributionService.class);
|
||||
IDistributionsManager distributionManager = null;
|
||||
if (type != null) {
|
||||
if (type == ECustomVersionType.SPARK) {
|
||||
distributionManager = hadoopDistributionService.getSparkBatchDistributionManager();
|
||||
} else if (type == ECustomVersionType.SPARK_STREAMING) {
|
||||
distributionManager = hadoopDistributionService.getSparkStreamingDistributionManager();
|
||||
} else if (type == ECustomVersionType.MAP_REDUCE) {
|
||||
distributionManager = hadoopDistributionService.getMapReduceDistributionManager();
|
||||
}
|
||||
}
|
||||
if (distributionManager == null) {// default one
|
||||
distributionManager = hadoopDistributionService.getHadoopDistributionManager();
|
||||
}
|
||||
return distributionManager;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,6 +32,7 @@ import org.talend.commons.ui.runtime.image.ImageProvider;
|
||||
import org.talend.commons.ui.swt.formtools.LabelledCombo;
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
import org.talend.core.hadoop.HadoopConstants;
|
||||
import org.talend.core.hadoop.IHadoopDistributionService;
|
||||
import org.talend.core.hadoop.IHadoopService;
|
||||
import org.talend.core.model.components.ComponentCategory;
|
||||
import org.talend.core.model.general.ModuleNeeded;
|
||||
@@ -39,6 +40,7 @@ import org.talend.core.model.process.IElementParameter;
|
||||
import org.talend.core.model.process.INode;
|
||||
import org.talend.core.runtime.CoreRuntimePlugin;
|
||||
import org.talend.core.runtime.hd.IDistributionsManager;
|
||||
import org.talend.core.runtime.hd.IHDConstants;
|
||||
import org.talend.core.runtime.hd.IHDistribution;
|
||||
import org.talend.core.runtime.hd.IHDistributionVersion;
|
||||
import org.talend.core.runtime.i18n.Messages;
|
||||
@@ -100,6 +102,13 @@ public class HadoopVersionDialog extends TitleAreaDialog {
|
||||
this.types = types;
|
||||
}
|
||||
|
||||
private IHadoopDistributionService getHadoopDistributionService() {
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopDistributionService.class)) {
|
||||
return (IHadoopDistributionService) GlobalServiceRegister.getDefault().getService(IHadoopDistributionService.class);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void configureShell(Shell newShell) {
|
||||
super.configureShell(newShell);
|
||||
@@ -269,9 +278,10 @@ public class HadoopVersionDialog extends TitleAreaDialog {
|
||||
}
|
||||
|
||||
private IHDistribution getHadoopDistribution() {
|
||||
IDistributionsManager distributionManager = getDistributionsManager();
|
||||
if (distributionManager != null) {
|
||||
final IHDistribution distributionByDisplay = distributionManager.getDistribution(distributionCombo.getText(), true);
|
||||
IHadoopDistributionService hadoopDistributionService = getHadoopDistributionService();
|
||||
if (hadoopDistributionService != null) {
|
||||
final IHDistribution distributionByDisplay = hadoopDistributionService.getHadoopDistribution(
|
||||
distributionCombo.getText(), true);
|
||||
return distributionByDisplay;
|
||||
}
|
||||
return null;
|
||||
@@ -347,23 +357,20 @@ public class HadoopVersionDialog extends TitleAreaDialog {
|
||||
});
|
||||
}
|
||||
|
||||
private IDistributionsManager getDistributionsManager() {
|
||||
if (types != null && types.length == 1) {
|
||||
return HadoopVersionControlUtils.getDistributionsManager(types[0]);
|
||||
}
|
||||
// try to get the default hadoop distributions
|
||||
return HadoopVersionControlUtils.getDistributionsManager(null);
|
||||
|
||||
}
|
||||
|
||||
private void init() {
|
||||
List<String> distributionsDisplay = new ArrayList<String>();
|
||||
IDistributionsManager distributionManager = getDistributionsManager();
|
||||
if (distributionManager != null) {
|
||||
IHadoopDistributionService hadoopDistributionService = getHadoopDistributionService();
|
||||
if (hadoopDistributionService != null) {
|
||||
IDistributionsManager distributionManager = null;
|
||||
if (isSparkJob()) {
|
||||
distributionManager = hadoopDistributionService.getSparkDistributionManager();
|
||||
} else {
|
||||
distributionManager = hadoopDistributionService.getHadoopDistributionManager();
|
||||
}
|
||||
IHDistribution[] distributions = distributionManager.getDistributions();
|
||||
if (distributions != null) {
|
||||
for (IHDistribution d : distributions) {
|
||||
if (!d.useCustom()) {// not need custom
|
||||
if (!d.useCustom()) {
|
||||
distributionsDisplay.add(d.getDisplayName());
|
||||
}
|
||||
}
|
||||
@@ -374,17 +381,43 @@ public class HadoopVersionDialog extends TitleAreaDialog {
|
||||
distributionCombo.select(0);
|
||||
}
|
||||
|
||||
private void updateVersionPart() {
|
||||
final IHDistribution hadoopDistribution = getHadoopDistribution();
|
||||
if (hadoopDistribution != null) {
|
||||
String[] versionsDisplay = hadoopDistribution.getVersionsDisplay();
|
||||
IHDistributionVersion defaultVersion = hadoopDistribution.getDefaultVersion();
|
||||
protected boolean isSparkJob() {
|
||||
if (types != null && types.length == 1
|
||||
&& (types[0] == ECustomVersionType.SPARK || types[0] == ECustomVersionType.SPARK_STREAMING)) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
versionCombo.getCombo().setItems(versionsDisplay);
|
||||
if (defaultVersion != null) {
|
||||
versionCombo.getCombo().setText(defaultVersion.getDisplayVersion());
|
||||
} else if (versionsDisplay.length > 0) {
|
||||
versionCombo.getCombo().select(0);
|
||||
private void updateVersionPart() {
|
||||
IHadoopDistributionService hadoopDistributionService = getHadoopDistributionService();
|
||||
if (hadoopDistributionService != null) {
|
||||
final IHDistribution hDistribution = hadoopDistributionService.getHadoopDistribution(distribution, false);
|
||||
if (hDistribution != null) {
|
||||
boolean isSparkJob = isSparkJob();
|
||||
final IHDistributionVersion[] hdVersions = hDistribution.getHDVersions();
|
||||
List<String> versionsDisplay = new ArrayList<String>();
|
||||
for (IHDistributionVersion hdv : hdVersions) {
|
||||
final String displayVersion = hdv.getDisplayVersion();
|
||||
if (displayVersion == null) {
|
||||
continue;
|
||||
}
|
||||
if (isSparkJob) {
|
||||
if (hadoopDistributionService.doSupportService(hdv, IHDConstants.SERVICE_SPARK)) {
|
||||
versionsDisplay.add(displayVersion);
|
||||
}
|
||||
} else {
|
||||
versionsDisplay.add(displayVersion);
|
||||
}
|
||||
}
|
||||
versionCombo.getCombo().setItems(versionsDisplay.toArray(new String[0]));
|
||||
IHDistributionVersion defaultVersion = hDistribution.getDefaultVersion();
|
||||
if (defaultVersion != null) {
|
||||
versionCombo.getCombo().setText(defaultVersion.getDisplayVersion());
|
||||
} else if (!versionsDisplay.isEmpty()) {
|
||||
versionCombo.getCombo().select(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -577,6 +577,7 @@ public class ContextUtils {
|
||||
}
|
||||
}
|
||||
if (modified) {
|
||||
processType.getContext().clear();
|
||||
processJobManager.saveToEmf(processType.getContext());
|
||||
added = true;
|
||||
}
|
||||
|
||||
@@ -19,7 +19,6 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.emf.common.util.BasicEList;
|
||||
import org.eclipse.emf.common.util.EList;
|
||||
import org.talend.core.model.metadata.MetadataTalendType;
|
||||
import org.talend.core.model.metadata.types.ContextParameterJavaTypeManager;
|
||||
@@ -243,47 +242,29 @@ public class JobContextManager implements IContextManager {
|
||||
return defaultContext;
|
||||
}
|
||||
|
||||
/**
|
||||
* If the context group or context parameter have existed, just update the attributes. If not existed, will create
|
||||
* new one. If not existed any more, will be removed.
|
||||
*/
|
||||
@Override
|
||||
public void saveToEmf(EList contextTypeList) {
|
||||
if (contextTypeList == null) {
|
||||
return;
|
||||
}
|
||||
ContextType contextType;
|
||||
IContext context;
|
||||
|
||||
EList contextTypeParamList;
|
||||
ContextParameterType contextParamType;
|
||||
IContextParameter contextParam;
|
||||
if (listContext.isEmpty()) {
|
||||
retrieveDefaultContext();
|
||||
}
|
||||
|
||||
EList newcontextTypeList = new BasicEList();
|
||||
for (int i = 0; i < listContext.size(); i++) {
|
||||
IContext context = listContext.get(i);
|
||||
String contextGroupName = context.getName();
|
||||
|
||||
ContextType contextType = findContextType(contextTypeList, contextGroupName);
|
||||
if (contextType == null) {
|
||||
contextType = TalendFileFactory.eINSTANCE.createContextType();
|
||||
contextType.setName(contextGroupName);
|
||||
}
|
||||
contextType = TalendFileFactory.eINSTANCE.createContextType();
|
||||
context = listContext.get(i);
|
||||
contextType.setName(context.getName());
|
||||
contextType.setConfirmationNeeded(context.isConfirmationNeeded());
|
||||
newcontextTypeList.add(contextType);
|
||||
|
||||
EList contextTypeParamList = contextType.getContextParameter();
|
||||
List<IContextParameter> contextParameterList = context.getContextParameterList();
|
||||
|
||||
EList newContextTypeParamList = new BasicEList();
|
||||
if (contextParameterList != null) {
|
||||
for (int j = 0; j < contextParameterList.size(); j++) {
|
||||
IContextParameter contextParam = contextParameterList.get(j);
|
||||
ContextParameterType contextParamType = findContextParameterType(contextTypeParamList, contextParam.getName());
|
||||
if (contextParamType == null) {
|
||||
contextParamType = TalendFileFactory.eINSTANCE.createContextParameterType();
|
||||
contextParamType.setName(contextParam.getName());
|
||||
}
|
||||
newContextTypeParamList.add(contextParamType);
|
||||
contextTypeParamList = contextType.getContextParameter();
|
||||
|
||||
if (context.getContextParameterList() != null) {
|
||||
for (int j = 0; j < context.getContextParameterList().size(); j++) {
|
||||
contextParamType = TalendFileFactory.eINSTANCE.createContextParameterType();
|
||||
contextParam = context.getContextParameterList().get(j);
|
||||
contextParamType.setName(contextParam.getName());
|
||||
contextParamType.setPrompt(contextParam.getPrompt());
|
||||
contextParamType.setType(contextParam.getType());
|
||||
contextParamType.setRawValue(contextParam.getValue());
|
||||
@@ -295,40 +276,11 @@ public class JobContextManager implements IContextManager {
|
||||
contextParamType.setRepositoryContextId(item.getProperty().getId());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
contextTypeParamList.clear(); // remove old
|
||||
contextTypeParamList.addAll(newContextTypeParamList);
|
||||
}
|
||||
}
|
||||
|
||||
contextTypeList.clear(); // clear old
|
||||
contextTypeList.addAll(newcontextTypeList);
|
||||
|
||||
}
|
||||
|
||||
private ContextType findContextType(EList contextTypeList, String contextName) {
|
||||
if (contextName != null) {
|
||||
for (int i = 0; i < contextTypeList.size(); i++) {
|
||||
ContextType contextType = (ContextType) contextTypeList.get(i);
|
||||
if (contextName.equals(contextType.getName())) {
|
||||
return contextType;
|
||||
contextTypeParamList.add(contextParamType);
|
||||
}
|
||||
}
|
||||
contextTypeList.add(contextType);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private ContextParameterType findContextParameterType(EList contextTypeParamList, String paramName) {
|
||||
if (paramName != null) {
|
||||
for (int i = 0; i < contextTypeParamList.size(); i++) {
|
||||
ContextParameterType contextParamType = (ContextParameterType) contextTypeParamList.get(i);
|
||||
if (paramName.equals(contextParamType.getName())) {
|
||||
return contextParamType;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -505,10 +505,7 @@ public class ModuleNeeded {
|
||||
if (getMavenUri() != null) {
|
||||
if (getMavenUri().split(MavenUrlHelper.SEPERATOR).length < 4 && getModuleName().lastIndexOf(".") != -1) {
|
||||
String extension = getModuleName().substring(getModuleName().lastIndexOf(".") + 1, getModuleName().length());
|
||||
artifact = MavenUrlHelper.parseMvnUrl(getMavenUri());
|
||||
if (artifact != null) {
|
||||
artifact.setType(extension);
|
||||
}
|
||||
artifact = MavenUrlHelper.parseMvnUrl(getMavenUri() + "/" + extension);
|
||||
} else {
|
||||
artifact = MavenUrlHelper.parseMvnUrl(getMavenUri());
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
// ============================================================================
|
||||
package org.talend.core.model.general;
|
||||
|
||||
import org.eclipse.emf.common.CommonPlugin;
|
||||
import org.eclipse.jface.preference.IPreferenceStore;
|
||||
import org.eclipse.ui.PlatformUI;
|
||||
import org.talend.core.context.Context;
|
||||
|
||||
@@ -24,7 +24,6 @@ import org.apache.avro.SchemaBuilder.FieldAssembler;
|
||||
import org.apache.avro.SchemaBuilder.FieldBuilder;
|
||||
import org.apache.avro.SchemaBuilder.PropBuilder;
|
||||
import org.apache.avro.SchemaBuilder.RecordBuilder;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.talend.core.model.metadata.builder.connection.ConnectionFactory;
|
||||
import org.talend.core.model.metadata.builder.connection.MetadataTable;
|
||||
import org.talend.core.model.metadata.types.JavaTypesManager;
|
||||
@@ -33,7 +32,6 @@ import org.talend.cwm.helper.TaggedValueHelper;
|
||||
import org.talend.daikon.avro.util.AvroTypes;
|
||||
import org.talend.daikon.avro.util.AvroUtils;
|
||||
import org.talend.daikon.talend6.Talend6SchemaConstants;
|
||||
|
||||
import orgomg.cwm.objectmodel.core.Expression;
|
||||
import orgomg.cwm.objectmodel.core.TaggedValue;
|
||||
|
||||
@@ -87,33 +85,25 @@ public final class MetadataToolAvroHelper {
|
||||
private static <T extends PropBuilder<T>> PropBuilder<T> copyTableProperties(PropBuilder<T> builder, MetadataTable in) {
|
||||
|
||||
// Properties common to tables and columns.
|
||||
|
||||
// FIXME: I comment it. I think there is no need to care id.
|
||||
// if (in.getId() != null) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_ID, in.getId());
|
||||
// }
|
||||
if (in.getId() != null) {
|
||||
builder.prop(Talend6SchemaConstants.TALEND6_ID, in.getId());
|
||||
}
|
||||
if (in.getComment() != null) {
|
||||
builder.prop(Talend6SchemaConstants.TALEND6_COMMENT, in.getComment());
|
||||
}
|
||||
if (in.getLabel() != null) {
|
||||
builder.prop(Talend6SchemaConstants.TALEND6_LABEL, in.getLabel());
|
||||
}
|
||||
if (in.isReadOnly()) {
|
||||
builder.prop(Talend6SchemaConstants.TALEND6_IS_READ_ONLY, "true"); //$NON-NLS-1$
|
||||
}
|
||||
for (TaggedValue tv : in.getTaggedValue()) {
|
||||
if (Talend6SchemaConstants.TALEND6_IS_READ_ONLY.equals(tv.getTag())) {
|
||||
builder.prop(Talend6SchemaConstants.TALEND6_IS_READ_ONLY, tv.getValue());
|
||||
break;
|
||||
String additionalTag = tv.getTag();
|
||||
if (tv.getValue() != null) {
|
||||
builder.prop(Talend6SchemaConstants.TALEND6_ADDITIONAL_PROPERTIES + additionalTag, tv.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
// FIXME: I comment those codes. I think it is no need concerned about the tagged values since they are already
|
||||
// contained by metadata table and even the avro schema is stored by tagged values. -ycbai
|
||||
// for (TaggedValue tv : in.getTaggedValue()) {
|
||||
// String additionalTag = tv.getTag();
|
||||
// if (tv.getValue() != null) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_ADDITIONAL_PROPERTIES + additionalTag, tv.getValue());
|
||||
// }
|
||||
// }
|
||||
|
||||
// Table-specific properties.
|
||||
if (in.getName() != null) {
|
||||
builder.prop(Talend6SchemaConstants.TALEND6_TABLE_NAME, in.getName());
|
||||
@@ -146,22 +136,22 @@ public final class MetadataToolAvroHelper {
|
||||
// Numeric types.
|
||||
if (JavaTypesManager.LONG.getId().equals(tt)) {
|
||||
type = AvroTypes._long();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Long.parseLong(defaultValue.toString());
|
||||
defaultValue = defaultValue == null ? null : Long.parseLong(defaultValue.toString());
|
||||
} else if (JavaTypesManager.INTEGER.getId().equals(tt)) {
|
||||
type = AvroTypes._int();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Integer.parseInt(defaultValue.toString());
|
||||
defaultValue = defaultValue == null ? null : Integer.parseInt(defaultValue.toString());
|
||||
} else if (JavaTypesManager.SHORT.getId().equals(tt)) {
|
||||
type = AvroTypes._short();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Integer.parseInt(defaultValue.toString());
|
||||
defaultValue = defaultValue == null ? null : Integer.parseInt(defaultValue.toString());
|
||||
} else if (JavaTypesManager.BYTE.getId().equals(tt)) {
|
||||
type = AvroTypes._byte();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Integer.parseInt(defaultValue.toString());
|
||||
defaultValue = defaultValue == null ? null : Integer.parseInt(defaultValue.toString());
|
||||
} else if (JavaTypesManager.DOUBLE.getId().equals(tt)) {
|
||||
type = AvroTypes._double();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Double.parseDouble(defaultValue.toString());
|
||||
defaultValue = defaultValue == null ? null : Double.parseDouble(defaultValue.toString());
|
||||
} else if (JavaTypesManager.FLOAT.getId().equals(tt)) {
|
||||
type = AvroTypes._float();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Float.parseFloat(defaultValue.toString());
|
||||
defaultValue = defaultValue == null ? null : Float.parseFloat(defaultValue.toString());
|
||||
} else if (JavaTypesManager.BIGDECIMAL.getId().equals(tt)) {
|
||||
// decimal(precision, scale) == column length and precision?
|
||||
type = AvroTypes._decimal();
|
||||
@@ -170,7 +160,7 @@ public final class MetadataToolAvroHelper {
|
||||
// Other primitive types that map directly to Avro.
|
||||
else if (JavaTypesManager.BOOLEAN.getId().equals(tt)) {
|
||||
type = AvroTypes._boolean();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Boolean.parseBoolean(defaultValue.toString());
|
||||
defaultValue = defaultValue == null ? null : Boolean.parseBoolean(defaultValue.toString());
|
||||
} else if (JavaTypesManager.BYTE_ARRAY.getId().equals(tt)) {
|
||||
type = AvroTypes._bytes();
|
||||
} else if (JavaTypesManager.DATE.getId().equals(tt)) {
|
||||
@@ -212,16 +202,14 @@ public final class MetadataToolAvroHelper {
|
||||
if (in.getLabel() != null) {
|
||||
schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_DYNAMIC_COLUMN_NAME, in.getLabel());
|
||||
}
|
||||
|
||||
if (in.isReadOnly()) {
|
||||
schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_DYNAMIC_IS_READ_ONLY, "true"); //$NON-NLS-1$
|
||||
}
|
||||
for (TaggedValue tv : in.getTaggedValue()) {
|
||||
if (Talend6SchemaConstants.TALEND6_IS_READ_ONLY.equals(tv.getTag())) {
|
||||
schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_DYNAMIC_IS_READ_ONLY, tv.getValue()); //$NON-NLS-1$
|
||||
} else {
|
||||
String additionalTag = tv.getTag();
|
||||
if (tv.getValue() != null) {
|
||||
schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_DYNAMIC_ADDITIONAL_PROPERTIES
|
||||
+ additionalTag, tv.getValue());
|
||||
}
|
||||
String additionalTag = tv.getTag();
|
||||
if (tv.getValue() != null) {
|
||||
schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_DYNAMIC_ADDITIONAL_PROPERTIES
|
||||
+ additionalTag, tv.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -254,9 +242,6 @@ public final class MetadataToolAvroHelper {
|
||||
schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_COLUMN_PRECISION,
|
||||
String.valueOf(in.getPrecision()));
|
||||
}
|
||||
if (in.getScale() >= 0) {
|
||||
schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_COLUMN_SCALE, String.valueOf(in.getScale()));
|
||||
}
|
||||
if (in.getInitialValue() != null && in.getInitialValue().getBody() != null) {
|
||||
schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_COLUMN_DEFAULT, in.getInitialValue().getBody());
|
||||
}
|
||||
@@ -293,11 +278,11 @@ public final class MetadataToolAvroHelper {
|
||||
if (in.getLabel() != null) {
|
||||
builder.prop(Talend6SchemaConstants.TALEND6_LABEL, in.getLabel());
|
||||
}
|
||||
if (in.isReadOnly()) {
|
||||
builder.prop(Talend6SchemaConstants.TALEND6_IS_READ_ONLY, "true"); //$NON-NLS-1$
|
||||
}
|
||||
for (TaggedValue tv : in.getTaggedValue()) {
|
||||
String additionalTag = tv.getTag();
|
||||
if (Talend6SchemaConstants.TALEND6_IS_READ_ONLY.equals(additionalTag)) {
|
||||
builder.prop(Talend6SchemaConstants.TALEND6_IS_READ_ONLY, tv.getValue());
|
||||
} else
|
||||
if (tv.getValue() != null) {
|
||||
builder.prop(Talend6SchemaConstants.TALEND6_ADDITIONAL_PROPERTIES + additionalTag, tv.getValue());
|
||||
}
|
||||
@@ -369,11 +354,10 @@ public final class MetadataToolAvroHelper {
|
||||
table.setComment(in.getProp(Talend6SchemaConstants.TALEND6_ID));
|
||||
}
|
||||
if (null != (prop = in.getProp(Talend6SchemaConstants.TALEND6_LABEL))) {
|
||||
table.setLabel(in.getProp(Talend6SchemaConstants.TALEND6_LABEL));
|
||||
table.setLabel(null);
|
||||
}
|
||||
if (null != (prop = in.getProp(Talend6SchemaConstants.TALEND6_IS_READ_ONLY))) {
|
||||
TaggedValue tv = TaggedValueHelper.createTaggedValue(Talend6SchemaConstants.TALEND6_IS_READ_ONLY, prop);
|
||||
table.getTaggedValue().add(tv);
|
||||
table.setReadOnly(Boolean.parseBoolean(prop));
|
||||
}
|
||||
for (String key : in.getJsonProps().keySet()) {
|
||||
if (key.startsWith(Talend6SchemaConstants.TALEND6_ADDITIONAL_PROPERTIES)) {
|
||||
@@ -421,8 +405,7 @@ public final class MetadataToolAvroHelper {
|
||||
col.setLabel(prop);
|
||||
}
|
||||
if (null != (prop = schema.getProp(Talend6SchemaConstants.TALEND6_DYNAMIC_IS_READ_ONLY))) {
|
||||
TaggedValue tv = TaggedValueHelper.createTaggedValue(Talend6SchemaConstants.TALEND6_IS_READ_ONLY, prop);
|
||||
col.getTaggedValue().add(tv);
|
||||
col.setReadOnly(Boolean.parseBoolean(prop));
|
||||
}
|
||||
for (String key : schema.getJsonProps().keySet()) {
|
||||
if (key.startsWith(Talend6SchemaConstants.TALEND6_ADDITIONAL_PROPERTIES)) {
|
||||
@@ -443,21 +426,15 @@ public final class MetadataToolAvroHelper {
|
||||
col.setTalendType(prop);
|
||||
}
|
||||
if (null != (prop = schema.getProp(Talend6SchemaConstants.TALEND6_COLUMN_PATTERN))) {
|
||||
if (!StringUtils.isEmpty(prop)) {
|
||||
col.setPattern(TalendQuoteUtils.addQuotesIfNotExist(prop));
|
||||
}
|
||||
col.setPattern(TalendQuoteUtils.addQuotesIfNotExist(prop));
|
||||
}
|
||||
if (null != (prop = schema.getProp(Talend6SchemaConstants.TALEND6_COLUMN_LENGTH))) {
|
||||
Long value = Long.parseLong(prop);
|
||||
col.setLength(value > 0 ? value : -1);
|
||||
} else {
|
||||
col.setLength(-1);
|
||||
}
|
||||
if (null != (prop = schema.getProp(Talend6SchemaConstants.TALEND6_COLUMN_ORIGINAL_LENGTH))) {
|
||||
Long value = Long.parseLong(prop);
|
||||
col.setOriginalLength(value > 0 ? value : -1);
|
||||
} else {
|
||||
col.setOriginalLength(-1);
|
||||
}
|
||||
if (null != (prop = schema.getProp(Talend6SchemaConstants.TALEND6_COLUMN_IS_NULLABLE))) {
|
||||
col.setNullable(Boolean.parseBoolean(prop));
|
||||
@@ -465,8 +442,6 @@ public final class MetadataToolAvroHelper {
|
||||
if (null != (prop = schema.getProp(Talend6SchemaConstants.TALEND6_COLUMN_PRECISION))) {
|
||||
Long value = Long.parseLong(prop);
|
||||
col.setPrecision(value > 0 ? value : -1);
|
||||
} else {
|
||||
col.setPrecision(-1);
|
||||
}
|
||||
if (null != (prop = schema.getProp(Talend6SchemaConstants.TALEND6_COLUMN_DEFAULT))) {
|
||||
col.setDefaultValue(prop);
|
||||
@@ -537,14 +512,13 @@ public final class MetadataToolAvroHelper {
|
||||
col.setId(prop);
|
||||
}
|
||||
if (null != (prop = field.getProp(Talend6SchemaConstants.TALEND6_COMMENT))) {
|
||||
col.setComment(prop);
|
||||
col.setComment(field.getProp(Talend6SchemaConstants.TALEND6_ID));
|
||||
}
|
||||
if (null != (prop = field.getProp(Talend6SchemaConstants.TALEND6_LABEL))) {
|
||||
col.setLabel(prop);
|
||||
col.setLabel(null);
|
||||
}
|
||||
if (null != (prop = field.getProp(Talend6SchemaConstants.TALEND6_IS_READ_ONLY))) {
|
||||
TaggedValue tv = TaggedValueHelper.createTaggedValue(Talend6SchemaConstants.TALEND6_IS_READ_ONLY, prop);
|
||||
col.getTaggedValue().add(tv);
|
||||
col.setReadOnly(Boolean.parseBoolean(prop));
|
||||
}
|
||||
for (String key : field.getJsonProps().keySet()) {
|
||||
if (key.startsWith(Talend6SchemaConstants.TALEND6_ADDITIONAL_PROPERTIES)) {
|
||||
@@ -553,10 +527,6 @@ public final class MetadataToolAvroHelper {
|
||||
col.getTaggedValue().add(tv);
|
||||
}
|
||||
}
|
||||
if (null != (prop = field.getProp(Talend6SchemaConstants.TALEND6_COLUMN_CUSTOM))) {
|
||||
TaggedValue tv = TaggedValueHelper.createTaggedValue(Talend6SchemaConstants.TALEND6_COLUMN_CUSTOM, prop);
|
||||
col.getTaggedValue().add(tv);
|
||||
}
|
||||
|
||||
// Column-specific properties.
|
||||
if (null != (prop = field.getProp(Talend6SchemaConstants.TALEND6_COLUMN_IS_KEY))) {
|
||||
@@ -569,21 +539,15 @@ public final class MetadataToolAvroHelper {
|
||||
col.setTalendType(prop);
|
||||
}
|
||||
if (null != (prop = field.getProp(Talend6SchemaConstants.TALEND6_COLUMN_PATTERN))) {
|
||||
if (!StringUtils.isEmpty(prop)) {
|
||||
col.setPattern(TalendQuoteUtils.addQuotesIfNotExist(prop));
|
||||
}
|
||||
col.setPattern(TalendQuoteUtils.addQuotesIfNotExist(prop));
|
||||
}
|
||||
if (null != (prop = field.getProp(Talend6SchemaConstants.TALEND6_COLUMN_LENGTH))) {
|
||||
Long value = Long.parseLong(prop);
|
||||
col.setLength(value > 0 ? value : -1);
|
||||
} else {
|
||||
col.setLength(-1);
|
||||
}
|
||||
if (null != (prop = field.getProp(Talend6SchemaConstants.TALEND6_COLUMN_ORIGINAL_LENGTH))) {
|
||||
Long value = Long.parseLong(prop);
|
||||
col.setOriginalLength(value > 0 ? value : -1);
|
||||
} else {
|
||||
col.setOriginalLength(-1);
|
||||
}
|
||||
if (null != (prop = field.getProp(Talend6SchemaConstants.TALEND6_COLUMN_IS_NULLABLE))) {
|
||||
col.setNullable(Boolean.parseBoolean(prop));
|
||||
@@ -591,14 +555,6 @@ public final class MetadataToolAvroHelper {
|
||||
if (null != (prop = field.getProp(Talend6SchemaConstants.TALEND6_COLUMN_PRECISION))) {
|
||||
Long value = Long.parseLong(prop);
|
||||
col.setPrecision(value > 0 ? value : -1);
|
||||
} else {
|
||||
col.setPrecision(-1);
|
||||
}
|
||||
if (null != (prop = field.getProp(Talend6SchemaConstants.TALEND6_COLUMN_SCALE))) {
|
||||
Long value = Long.parseLong(prop);
|
||||
col.setScale(value > 0 ? value : -1);
|
||||
} else {
|
||||
col.setScale(-1);
|
||||
}
|
||||
if (null != (prop = field.getProp(Talend6SchemaConstants.TALEND6_COLUMN_DEFAULT))) {
|
||||
col.setDefaultValue(prop);
|
||||
@@ -620,282 +576,4 @@ public final class MetadataToolAvroHelper {
|
||||
|
||||
return col;
|
||||
}
|
||||
|
||||
// /**
|
||||
// * @return An Avro schema with enriched properties from the incoming metadata table.
|
||||
// */
|
||||
// public static org.apache.avro.Schema convertToAvro(IMetadataTable in) {
|
||||
// RecordBuilder<Schema> builder = SchemaBuilder.builder().record(in.getTableName());
|
||||
// copyTableProperties(builder, in);
|
||||
//
|
||||
// FieldAssembler<Schema> fa = builder.fields();
|
||||
// int dynamicPosition = -1;
|
||||
// IMetadataColumn dynColumn = null;
|
||||
// int i = 0;
|
||||
// for (IMetadataColumn column : in.getListColumns()) {
|
||||
// if ("id_Dynamic".equals(column.getTalendType())) { //$NON-NLS-1$
|
||||
// dynamicPosition = i;
|
||||
// dynColumn = column;
|
||||
// } else {
|
||||
// fa = convertToAvro(fa, column);
|
||||
// }
|
||||
// i++;
|
||||
// }
|
||||
//
|
||||
// Schema schema = fa.endRecord();
|
||||
//
|
||||
// if (dynColumn != null) {
|
||||
// // store all the dynamic column's properties
|
||||
// schema = copyDynamicColumnProperties(schema, dynColumn);
|
||||
// // store dynamic position
|
||||
// schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_DYNAMIC_COLUMN_POSITION,
|
||||
// String.valueOf(dynamicPosition));
|
||||
// // tag avro schema with include-all-columns
|
||||
// schema = AvroUtils.setIncludeAllFields(schema, true);
|
||||
// }
|
||||
// return schema;
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Copy all of the information from the MetadataTable in the form of key/value properties into an Avro object.
|
||||
// *
|
||||
// * @param builder Any Avro builder capable of taking key/value in the form of strings.
|
||||
// * @param in The element to copy information from.
|
||||
// * @return the instance of the builder passed in.
|
||||
// */
|
||||
// private static <T extends PropBuilder<T>> PropBuilder<T> copyTableProperties(PropBuilder<T> builder,
|
||||
// IMetadataTable in) {
|
||||
//
|
||||
// // Properties common to tables and columns.
|
||||
//
|
||||
// // FIXME: I comment it. I think there is no need to care id.
|
||||
// // if (in.getId() != null) {
|
||||
// // builder.prop(Talend6SchemaConstants.TALEND6_ID, in.getId());
|
||||
// // }
|
||||
// if (in.getComment() != null) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_COMMENT, in.getComment());
|
||||
// }
|
||||
// if (in.getLabel() != null) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_LABEL, in.getLabel());
|
||||
// }
|
||||
// if (in.isReadOnly()) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_IS_READ_ONLY, "true"); //$NON-NLS-1$
|
||||
// }
|
||||
//
|
||||
// // Table-specific properties.
|
||||
// if (in.getTableName() != null) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_TABLE_NAME, in.getTableName());
|
||||
// }
|
||||
// if (in.getTableType() != null) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_TABLE_TYPE, in.getTableType());
|
||||
// }
|
||||
//
|
||||
// return builder;
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Build a field into a schema using enriched properties from the incoming column.
|
||||
// */
|
||||
// private static FieldAssembler<Schema> convertToAvro(FieldAssembler<Schema> fa, IMetadataColumn in) {
|
||||
// FieldBuilder<Schema> fb = fa.name(in.getLabel());
|
||||
// copyColumnProperties(fb, in);
|
||||
// BaseFieldTypeBuilder<Schema> ftb = in.isNullable() ? fb.type().nullable() : fb.type();
|
||||
//
|
||||
// Object defaultValue = in.getDefault();
|
||||
//
|
||||
// String tt = in.getTalendType();
|
||||
//
|
||||
// Schema type = null;
|
||||
// // Numeric types.
|
||||
// if (JavaTypesManager.LONG.getId().equals(tt)) {
|
||||
// type = AvroTypes._long();
|
||||
// defaultValue = defaultValue == null ? null : Long.parseLong(defaultValue.toString());
|
||||
// } else if (JavaTypesManager.INTEGER.getId().equals(tt)) {
|
||||
// type = AvroTypes._int();
|
||||
// defaultValue = defaultValue == null ? null : Integer.parseInt(defaultValue.toString());
|
||||
// } else if (JavaTypesManager.SHORT.getId().equals(tt)) {
|
||||
// type = AvroTypes._short();
|
||||
// defaultValue = defaultValue == null ? null : Integer.parseInt(defaultValue.toString());
|
||||
// } else if (JavaTypesManager.BYTE.getId().equals(tt)) {
|
||||
// type = AvroTypes._byte();
|
||||
// defaultValue = defaultValue == null ? null : Integer.parseInt(defaultValue.toString());
|
||||
// } else if (JavaTypesManager.DOUBLE.getId().equals(tt)) {
|
||||
// type = AvroTypes._double();
|
||||
// defaultValue = defaultValue == null ? null : Double.parseDouble(defaultValue.toString());
|
||||
// } else if (JavaTypesManager.FLOAT.getId().equals(tt)) {
|
||||
// type = AvroTypes._float();
|
||||
// defaultValue = defaultValue == null ? null : Float.parseFloat(defaultValue.toString());
|
||||
// } else if (JavaTypesManager.BIGDECIMAL.getId().equals(tt)) {
|
||||
// // decimal(precision, scale) == column length and precision?
|
||||
// type = AvroTypes._decimal();
|
||||
// }
|
||||
//
|
||||
// // Other primitive types that map directly to Avro.
|
||||
// else if (JavaTypesManager.BOOLEAN.getId().equals(tt)) {
|
||||
// type = AvroTypes._boolean();
|
||||
// defaultValue = defaultValue == null ? null : Boolean.parseBoolean(defaultValue.toString());
|
||||
// } else if (JavaTypesManager.BYTE_ARRAY.getId().equals(tt)) {
|
||||
// type = AvroTypes._bytes();
|
||||
// } else if (JavaTypesManager.DATE.getId().equals(tt)) {
|
||||
// type = AvroTypes._date();
|
||||
// }
|
||||
// // String-ish types.
|
||||
// else if (JavaTypesManager.STRING.getId().equals(tt) || JavaTypesManager.FILE.getId().equals(tt)
|
||||
// || JavaTypesManager.DIRECTORY.getId().equals(tt) || JavaTypesManager.VALUE_LIST.getId().equals(tt)
|
||||
// || JavaTypesManager.CHARACTER.getId().equals(tt) || JavaTypesManager.PASSWORD.getId().equals(tt)) {
|
||||
// type = AvroTypes._string();
|
||||
// }
|
||||
//
|
||||
// // Types with unknown elements, store as binary
|
||||
// if (JavaTypesManager.OBJECT.getId().equals(tt)) {
|
||||
// // FIXME it's not right, as it don't store all the information about the object
|
||||
// }
|
||||
//
|
||||
// if (JavaTypesManager.LIST.getId().equals(tt)) {
|
||||
// // FIXME it's not right, as it don't store all the information about the object
|
||||
// }
|
||||
// // Can this occur?
|
||||
// if (type == null) {
|
||||
// throw new UnsupportedOperationException("Unrecognized type " + tt); //$NON-NLS-1$
|
||||
// }
|
||||
//
|
||||
// type = in.isNullable() ? AvroUtils.wrapAsNullable(type) : type;
|
||||
// return defaultValue == null ? fb.type(type).noDefault() : fb.type(type).withDefault(defaultValue);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Copy all of the information from the IMetadataColumn in the form of key/value properties into an Avro object.
|
||||
// *
|
||||
// * @param builder Any Avro builder capable of taking key/value in the form of strings.
|
||||
// * @param in The element to copy information from.
|
||||
// * @return the instance of the builder passed in.
|
||||
// */
|
||||
// private static <T extends PropBuilder<T>> PropBuilder<T> copyColumnProperties(PropBuilder<T> builder,
|
||||
// IMetadataColumn in) {
|
||||
// // Properties common to tables and columns.
|
||||
// if (in.getId() != null) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_ID, in.getId());
|
||||
// }
|
||||
// if (in.getComment() != null) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_COMMENT, in.getComment());
|
||||
// }
|
||||
// if (in.getLabel() != null) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_LABEL, in.getLabel());
|
||||
// }
|
||||
// if (in.isReadOnly()) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_IS_READ_ONLY, "true"); //$NON-NLS-1$
|
||||
// }
|
||||
// // no such support for IMetadataColumn
|
||||
// //
|
||||
// // for (TaggedValue tv : in.getTaggedValue()) {
|
||||
// // String additionalTag = tv.getTag();
|
||||
// // if (tv.getValue() != null) {
|
||||
// // builder.prop(Talend6SchemaConstants.TALEND6_ADDITIONAL_PROPERTIES + additionalTag, tv.getValue());
|
||||
// // }
|
||||
// // }
|
||||
//
|
||||
// // Column-specific properties.
|
||||
// if (in.isKey()) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_COLUMN_IS_KEY, "true"); //$NON-NLS-1$
|
||||
// }
|
||||
// if (in.getType() != null) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_COLUMN_SOURCE_TYPE, in.getType());
|
||||
// }
|
||||
// if (in.getTalendType() != null) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_COLUMN_TALEND_TYPE, in.getTalendType());
|
||||
// }
|
||||
// if (in.getPattern() != null) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_COLUMN_PATTERN,
|
||||
// TalendQuoteUtils.removeQuotesIfExist(in.getPattern()));
|
||||
// }
|
||||
// if (in.getLength() != null && in.getLength() >= 0) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_COLUMN_LENGTH, String.valueOf((int) in.getLength()));
|
||||
// }
|
||||
// if (in.getOriginalLength() != null && in.getOriginalLength() >= 0) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_COLUMN_ORIGINAL_LENGTH, String.valueOf(in.getOriginalLength()));
|
||||
// }
|
||||
// if (in.isNullable()) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_COLUMN_IS_NULLABLE, "true"); //$NON-NLS-1$
|
||||
// }
|
||||
// if (in.getPrecision() != null && in.getPrecision() >= 0) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_COLUMN_PRECISION, String.valueOf(in.getPrecision()));
|
||||
// }
|
||||
// if (in.getDefault() != null) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_COLUMN_DEFAULT, in.getDefault());
|
||||
// }
|
||||
// if (in.getOriginalDbColumnName() != null) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_COLUMN_ORIGINAL_DB_COLUMN_NAME, in.getOriginalDbColumnName());
|
||||
// }
|
||||
// if (in.getRelatedEntity() != null) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_COLUMN_RELATED_ENTITY, in.getRelatedEntity());
|
||||
// }
|
||||
// if (in.getRelationshipType() != null) {
|
||||
// builder.prop(Talend6SchemaConstants.TALEND6_COLUMN_RELATIONSHIP_TYPE, in.getRelationshipType());
|
||||
// }
|
||||
// return builder;
|
||||
// }
|
||||
//
|
||||
// private static Schema copyDynamicColumnProperties(Schema schema,
|
||||
// IMetadataColumn in) {
|
||||
// Map<String, String> props = new HashMap<String, String>();
|
||||
// if (in.getId() != null) {
|
||||
// schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_DYNAMIC_COLUMN_ID, in.getId());
|
||||
// }
|
||||
// if (in.getComment() != null) {
|
||||
// schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_DYNAMIC_COLUMN_COMMENT, in.getComment());
|
||||
// }
|
||||
// if (in.getLabel() != null) {
|
||||
// schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_DYNAMIC_COLUMN_NAME, in.getLabel());
|
||||
// }
|
||||
// if (in.isReadOnly()) {
|
||||
// schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_DYNAMIC_IS_READ_ONLY, "true"); //$NON-NLS-1$
|
||||
// }
|
||||
//
|
||||
// // Column-specific properties.
|
||||
// if (in.isKey()) {
|
||||
// schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_COLUMN_IS_KEY, "true"); //$NON-NLS-1$
|
||||
// }
|
||||
// if (in.getType() != null) {
|
||||
// schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_COLUMN_SOURCE_TYPE, in.getType());
|
||||
// }
|
||||
// if (in.getTalendType() != null) {
|
||||
// schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_COLUMN_TALEND_TYPE, in.getTalendType());
|
||||
// }
|
||||
// if (in.getPattern() != null) {
|
||||
// schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_COLUMN_PATTERN,
|
||||
// TalendQuoteUtils.removeQuotesIfExist(in.getPattern()));
|
||||
// }
|
||||
// if (in.getLength() >= 0) {
|
||||
// schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_COLUMN_LENGTH,
|
||||
// String.valueOf((int) in.getLength()));
|
||||
// }
|
||||
// if (in.getOriginalLength() >= 0) {
|
||||
// schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_COLUMN_ORIGINAL_LENGTH,
|
||||
// String.valueOf(in.getOriginalLength()));
|
||||
// }
|
||||
// if (in.isNullable()) {
|
||||
// schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_COLUMN_IS_NULLABLE, "true"); //$NON-NLS-1$
|
||||
// }
|
||||
// if (in.getPrecision() >= 0) {
|
||||
// schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_COLUMN_PRECISION,
|
||||
// String.valueOf(in.getPrecision()));
|
||||
// }
|
||||
// if (in.getDefault() != null) {
|
||||
// schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_COLUMN_DEFAULT, in.getDefault());
|
||||
// }
|
||||
// if (in.getOriginalDbColumnName() != null) {
|
||||
// // keyword fixes?
|
||||
// schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_COLUMN_ORIGINAL_DB_COLUMN_NAME,
|
||||
// in.getOriginalDbColumnName());
|
||||
// }
|
||||
// if (in.getRelatedEntity() != null) {
|
||||
// schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_COLUMN_RELATED_ENTITY,
|
||||
// in.getRelatedEntity());
|
||||
// }
|
||||
// if (in.getRelationshipType() != null) {
|
||||
// schema = AvroUtils.setProperty(schema, Talend6SchemaConstants.TALEND6_COLUMN_RELATIONSHIP_TYPE,
|
||||
// in.getRelationshipType());
|
||||
// }
|
||||
// return schema;
|
||||
// }
|
||||
}
|
||||
|
||||
@@ -24,7 +24,6 @@ import java.util.Set;
|
||||
import java.util.Vector;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.apache.avro.Schema;
|
||||
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
|
||||
import org.eclipse.core.runtime.preferences.InstanceScope;
|
||||
import org.eclipse.emf.common.util.BasicEList;
|
||||
@@ -38,7 +37,6 @@ import org.eclipse.swt.events.KeyEvent;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.commons.runtime.model.components.IComponentConstants;
|
||||
import org.talend.commons.runtime.model.repository.ERepositoryStatus;
|
||||
import org.talend.commons.ui.runtime.exception.ExceptionHandler;
|
||||
import org.talend.commons.utils.data.list.UniqueStringGenerator;
|
||||
@@ -73,14 +71,12 @@ import org.talend.core.runtime.i18n.Messages;
|
||||
import org.talend.core.runtime.services.IGenericWizardService;
|
||||
import org.talend.core.utils.KeywordsValidator;
|
||||
import org.talend.cwm.helper.ConnectionHelper;
|
||||
import org.talend.daikon.talend6.Talend6SchemaConstants;
|
||||
import org.talend.designer.core.model.utils.emf.talendfile.ColumnType;
|
||||
import org.talend.designer.core.model.utils.emf.talendfile.MetadataType;
|
||||
import org.talend.designer.core.model.utils.emf.talendfile.TalendFileFactory;
|
||||
import org.talend.repository.model.IProxyRepositoryFactory;
|
||||
import org.talend.repository.model.IRepositoryService;
|
||||
import org.talend.repository.model.RepositoryConstants;
|
||||
|
||||
import orgomg.cwm.objectmodel.core.TaggedValue;
|
||||
|
||||
/**
|
||||
@@ -608,11 +604,7 @@ public final class MetadataToolHelper {
|
||||
target.getListColumns().addAll(columnsTAdd);
|
||||
target.sortCustomColumns();
|
||||
target.setLabel(source.getLabel());
|
||||
Map<String, String> targetProperties = target.getAdditionalProperties();
|
||||
Map<String, String> sourceProperties = source.getAdditionalProperties();
|
||||
for (Entry<String, String> entry : sourceProperties.entrySet()) {
|
||||
targetProperties.put(entry.getKey(), entry.getValue());
|
||||
}
|
||||
target.getAdditionalProperties().putAll(source.getAdditionalProperties());
|
||||
}
|
||||
|
||||
public static void copyTable(List<IMetadataColumn> sourceColumns, IMetadataTable target, List<IMetadataColumn> targetColumns) {
|
||||
@@ -1009,10 +1001,7 @@ public final class MetadataToolHelper {
|
||||
public static IMetadataTable getMetadataFromRepository(String metaRepositoryId) {
|
||||
MetadataTable table = getMetadataTableFromRepository(metaRepositoryId);
|
||||
if (table != null) {
|
||||
IMetadataTable convertedTable = convert(table);
|
||||
convertedTable.getAdditionalProperties().remove(IComponentConstants.COMPONENT_PROPERTIES_TAG);
|
||||
convertedTable.getAdditionalProperties().remove(IComponentConstants.COMPONENT_SCHEMA_TAG);
|
||||
return convertedTable;
|
||||
return convert(table);
|
||||
}
|
||||
return null;
|
||||
|
||||
@@ -1134,21 +1123,6 @@ public final class MetadataToolHelper {
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (param.getFieldType() == EParameterFieldType.SCHEMA_REFERENCE) {
|
||||
if (!param.getDefaultValues().isEmpty()) {
|
||||
Schema schema = (Schema) param.getDefaultValues().get(0).getDefaultValue();
|
||||
org.talend.core.model.metadata.builder.connection.MetadataTable defaultEmfTable = MetadataToolAvroHelper
|
||||
.convertFromAvro(schema);
|
||||
IMetadataTable defaultTable = MetadataToolHelper.convert(defaultEmfTable);
|
||||
for (IMetadataColumn currentColumn : metadataTable.getListColumns()) {
|
||||
IMetadataColumn defaultColumn = defaultTable.getColumn(currentColumn.getLabel());
|
||||
if (defaultColumn != null) {
|
||||
currentColumn.setCustom(defaultColumn.isCustom());
|
||||
currentColumn.setReadOnly(defaultColumn.isReadOnly());
|
||||
}
|
||||
}
|
||||
metadataTable.setReadOnly(defaultTable.isReadOnly());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1352,13 +1326,6 @@ public final class MetadataToolHelper {
|
||||
}
|
||||
result.setTableName(sourceName);
|
||||
List<IMetadataColumn> columns = new ArrayList<IMetadataColumn>(old.getColumns().size());
|
||||
for (TaggedValue tv : old.getTaggedValue()) {
|
||||
if (Talend6SchemaConstants.TALEND6_IS_READ_ONLY.equals(tv.getTag())) {
|
||||
result.setReadOnly(Boolean.valueOf(tv.getValue()));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
for (Object o : old.getColumns()) {
|
||||
org.talend.core.model.metadata.builder.connection.MetadataColumn column = (org.talend.core.model.metadata.builder.connection.MetadataColumn) o;
|
||||
IMetadataColumn newColumn = new org.talend.core.model.metadata.MetadataColumn();
|
||||
@@ -1392,13 +1359,7 @@ public final class MetadataToolHelper {
|
||||
String[] splits = additionalTag.split(":");
|
||||
additionalTag = splits[1];
|
||||
}
|
||||
if (Talend6SchemaConstants.TALEND6_COLUMN_CUSTOM.equals(additionalTag)) {
|
||||
newColumn.setCustom(Boolean.valueOf(tv.getValue()));
|
||||
} else if (Talend6SchemaConstants.TALEND6_IS_READ_ONLY.equals(additionalTag)) {
|
||||
newColumn.setReadOnly(Boolean.valueOf(tv.getValue()));
|
||||
} else {
|
||||
newColumn.getAdditionalField().put(additionalTag, tv.getValue());
|
||||
}
|
||||
newColumn.getAdditionalField().put(additionalTag, tv.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,6 @@ import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.emf.common.util.EMap;
|
||||
import org.talend.commons.runtime.model.components.IComponentConstants;
|
||||
import org.talend.commons.utils.resource.FileExtensions;
|
||||
import org.talend.core.IRepositoryContextService;
|
||||
import org.talend.core.database.EDatabase4DriverClassName;
|
||||
@@ -47,7 +46,6 @@ import org.talend.core.utils.KeywordsValidator;
|
||||
import org.talend.cwm.helper.ConnectionHelper;
|
||||
import org.talend.cwm.helper.SAPBWTableHelper;
|
||||
import org.talend.model.bridge.ReponsitoryContextBridge;
|
||||
|
||||
import orgomg.cwm.objectmodel.core.TaggedValue;
|
||||
|
||||
/**
|
||||
@@ -421,12 +419,6 @@ public final class ConvertionHelper {
|
||||
}
|
||||
for (TaggedValue tv : old.getTaggedValue()) {
|
||||
String additionalTag = tv.getTag();
|
||||
if (IComponentConstants.COMPONENT_PROPERTIES_TAG.equals(additionalTag)) {
|
||||
continue;
|
||||
}
|
||||
if (IComponentConstants.COMPONENT_SCHEMA_TAG.equals(additionalTag)) {
|
||||
continue;
|
||||
}
|
||||
result.getAdditionalProperties().put(additionalTag, tv.getValue());
|
||||
}
|
||||
|
||||
|
||||
@@ -1198,42 +1198,6 @@ public class RepositoryToComponentProperty {
|
||||
String message = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HBASE_PROPERTIES);
|
||||
return HadoopRepositoryUtil.getHadoopPropertiesFullList(connection, message, true);
|
||||
}
|
||||
|
||||
if (value.equals("USE_CLOUDERA_NAVIGATOR")) {
|
||||
return HadoopRepositoryUtil.useClouderaNavi(connection);
|
||||
}
|
||||
|
||||
if (value.equals("CLOUDERA_NAVIGATOR_USERNAME")) {
|
||||
return getAppropriateValue(connection,HadoopRepositoryUtil.getClouderaNaviUserName(connection));
|
||||
}
|
||||
|
||||
if (value.equals("CLOUDERA_NAVIGATOR_PASSWORD")) {
|
||||
return getAppropriateValue(connection,HadoopRepositoryUtil.getClouderaNaviPassword(connection));
|
||||
}
|
||||
|
||||
if (value.equals("CLOUDERA_NAVIGATOR_URL")) {
|
||||
return getAppropriateValue(connection,HadoopRepositoryUtil.getClouderaNaviUrl(connection));
|
||||
}
|
||||
|
||||
if (value.equals("CLOUDERA_NAVIGATOR_METADATA_URL")) {
|
||||
return getAppropriateValue(connection,HadoopRepositoryUtil.getClouderaNaviMetadataUrl(connection));
|
||||
}
|
||||
|
||||
if (value.equals("CLOUDERA_NAVIGATOR_CLIENT_URL")) {
|
||||
return getAppropriateValue(connection,HadoopRepositoryUtil.getClouderaNaviClientUrl(connection));
|
||||
}
|
||||
|
||||
if (value.equals("CLOUDERA_NAVIGATOR_AUTOCOMMIT")) {
|
||||
return HadoopRepositoryUtil.clouderaNaviAutoCommit(connection);
|
||||
}
|
||||
|
||||
if (value.equals("CLOUDERA_NAVIGATOR_DISABLE_SSL_VALIDATION")) {
|
||||
return HadoopRepositoryUtil.clouderaNaviDisableSSL(connection);
|
||||
}
|
||||
|
||||
if (value.equals("CLOUDERA_NAVIGATOR_DIE_ON_ERROR")) {
|
||||
return HadoopRepositoryUtil.clouderaNaviDieOnError(connection);
|
||||
}
|
||||
|
||||
if (value.equals("HADOOP_ADVANCED_PROPERTIES")) {
|
||||
String message = null;
|
||||
@@ -1448,7 +1412,7 @@ public class RepositoryToComponentProperty {
|
||||
|
||||
if (value.equals("USE_DATANODE_HOSTNAME")) {
|
||||
String USE_DATANODE_HOSTNAME = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_USE_DATANODE_HOSTNAME);
|
||||
return USE_DATANODE_HOSTNAME == null ? null : "true".equals(USE_DATANODE_HOSTNAME);
|
||||
return "true".equals(USE_DATANODE_HOSTNAME);
|
||||
}
|
||||
|
||||
return null;
|
||||
|
||||
@@ -92,49 +92,23 @@ public final class ElementParameterParser {
|
||||
|
||||
public static boolean canEncrypt(final IElement node, final String parameterName) {
|
||||
String value = getValue(node, parameterName);
|
||||
if (canEncryptValue(value)) {
|
||||
if (value != null && value.startsWith("\"") && value.endsWith("\"") && TalendQuoteUtils.filterQuote(value).length() == 0) { //$NON-NLS-1$//$NON-NLS-2$
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* DOC nrousseau Comment method "canEncryptValue".
|
||||
*
|
||||
* @param value
|
||||
* @return
|
||||
*/
|
||||
public static boolean canEncryptValue(String value) {
|
||||
return value != null
|
||||
&& value.startsWith("\"") && value.endsWith("\"") && TalendQuoteUtils.filterQuote(value).length() == 0;//$NON-NLS-1$//$NON-NLS-2$
|
||||
}
|
||||
|
||||
public static String getEncryptedValue(final IElement node, final String parameterName) {
|
||||
String value = getValue(node, parameterName);
|
||||
value = getEncryptedValue(value);
|
||||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
* DOC nrousseau Comment method "getEncryptedValue".
|
||||
*
|
||||
* @param value
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public static String getEncryptedValue(String value) {
|
||||
if (canEncryptValue(value)) {
|
||||
try {
|
||||
String removeQuotes = TalendQuoteUtils.removeQuotes(value);
|
||||
removeQuotes = TalendQuoteUtils.checkSlashAndRemoveQuotation(removeQuotes);
|
||||
removeQuotes = TalendQuoteUtils.checkAndRemoveBackslashes(removeQuotes);
|
||||
return TalendQuoteUtils.addQuotes(PasswordEncryptUtil.encryptPasswordHex(removeQuotes),
|
||||
TalendQuoteUtils.QUOTATION_MARK);
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
return value;
|
||||
}
|
||||
try {
|
||||
String removeQuotes = TalendQuoteUtils.removeQuotes(value);
|
||||
removeQuotes = TalendQuoteUtils.checkSlashAndRemoveQuotation(removeQuotes);
|
||||
removeQuotes = TalendQuoteUtils.checkAndRemoveBackslashes(removeQuotes);
|
||||
value = PasswordEncryptUtil.encryptPasswordHex(removeQuotes);
|
||||
value = TalendQuoteUtils.addQuotes(value, TalendQuoteUtils.QUOTATION_MARK);
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
return value;
|
||||
}
|
||||
@@ -389,12 +363,6 @@ public final class ElementParameterParser {
|
||||
newLine.put(items[i], replacedValue);
|
||||
} else {
|
||||
newLine.put(items[i], (String) o);
|
||||
if ("".equals(o) && param.getListItemsValue() != null && param.getListItemsValue()[i] instanceof IElementParameter) { //$NON-NLS-1$
|
||||
IElementParameter tmpParam = (IElementParameter) param.getListItemsValue()[i];
|
||||
if (tmpParam.getListItemsValue() != null && tmpParam.getListItemsValue().length > 0) {
|
||||
newLine.put(items[i], (String) tmpParam.getListItemsValue()[0]);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (o instanceof Boolean) {
|
||||
@@ -583,7 +551,8 @@ public final class ElementParameterParser {
|
||||
return ""; //$NON-NLS-1$
|
||||
}
|
||||
return processItem.getProperty().getVersion();
|
||||
} else if ("PROCESS_TYPE_CONTEXT".equals(param.getName())) { //$NON-NLS-1$
|
||||
}
|
||||
else if ("PROCESS_TYPE_CONTEXT".equals(param.getName())) { //$NON-NLS-1$
|
||||
String jobId = (String) param.getParentParameter().getChildParameters().get("PROCESS_TYPE_PROCESS").getValue(); //$NON-NLS-1$
|
||||
ProcessItem processItem = ItemCacheManager.getProcessItem(jobId);
|
||||
if (processItem == null) {
|
||||
@@ -604,7 +573,8 @@ public final class ElementParameterParser {
|
||||
return processItem.getProcess().getDefaultContext();
|
||||
}
|
||||
return (String) value;
|
||||
} else if ("SELECTED_JOB_NAME".equals(param.getName())) {
|
||||
}
|
||||
else if ("SELECTED_JOB_NAME".equals(param.getName())) {
|
||||
String jobId = (String) param.getChildParameters().get("PROCESS_TYPE_PROCESS").getValue(); //$NON-NLS-1$
|
||||
ProcessItem processItem = ItemCacheManager.getProcessItem(jobId);
|
||||
if (processItem == null) {
|
||||
|
||||
@@ -28,6 +28,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.core.runtime.NullProgressMonitor;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
import org.talend.core.model.general.Project;
|
||||
import org.talend.core.model.properties.Item;
|
||||
import org.talend.core.model.properties.ItemRelation;
|
||||
@@ -44,6 +45,7 @@ import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
|
||||
import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
|
||||
import org.talend.repository.ProjectManager;
|
||||
import org.talend.repository.model.IProxyRepositoryFactory;
|
||||
import org.talend.repository.model.IRepositoryService;
|
||||
|
||||
/**
|
||||
* This class store all relationships between jobs/joblets and other items from the repository. Be sure to update the
|
||||
@@ -124,10 +126,6 @@ public class RelationshipItemBuilder {
|
||||
|
||||
private boolean modified = false;
|
||||
|
||||
private Project aimProject;
|
||||
|
||||
private IProxyRepositoryFactory proxyRepositoryFactory;
|
||||
|
||||
public static final String COMMA = ";"; //$NON-NLS-1$
|
||||
|
||||
private static Map<String, RelationshipItemBuilder> projectToInstanceMap = new HashMap<String, RelationshipItemBuilder>();
|
||||
@@ -137,48 +135,16 @@ public class RelationshipItemBuilder {
|
||||
}
|
||||
|
||||
public static RelationshipItemBuilder getInstance() {
|
||||
Project currentProject = ProjectManager.getInstance().getCurrentProject();
|
||||
String projectName = currentProject.getTechnicalLabel();
|
||||
String currentProject = ProjectManager.getInstance().getCurrentProject().getTechnicalLabel();
|
||||
|
||||
if (projectToInstanceMap.containsKey(projectName)) {
|
||||
return projectToInstanceMap.get(projectName);
|
||||
if (projectToInstanceMap.containsKey(currentProject)) {
|
||||
return projectToInstanceMap.get(currentProject);
|
||||
}
|
||||
|
||||
IProxyRepositoryFactory proxyRepositoryFactory = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
|
||||
RelationshipItemBuilder instance = createInstance(proxyRepositoryFactory, currentProject);
|
||||
projectToInstanceMap.put(projectName, instance);
|
||||
return instance;
|
||||
}
|
||||
|
||||
public static RelationshipItemBuilder createInstance(IProxyRepositoryFactory repositoryFactory, Project project) {
|
||||
/**
|
||||
* NOTE: if use cache, should take care of synchronize problem
|
||||
*/
|
||||
|
||||
RelationshipItemBuilder instance = new RelationshipItemBuilder();
|
||||
instance.setAimProject(project);
|
||||
instance.setProxyRepositoryFactory(repositoryFactory);
|
||||
// won't store instance for other projects
|
||||
// projectToInstanceMap.put(projectName, instance);
|
||||
projectToInstanceMap.put(currentProject, instance);
|
||||
return instance;
|
||||
}
|
||||
|
||||
public Project getAimProject() {
|
||||
return this.aimProject;
|
||||
}
|
||||
|
||||
private void setAimProject(Project aimProject) {
|
||||
this.aimProject = aimProject;
|
||||
}
|
||||
|
||||
private IProxyRepositoryFactory getProxyRepositoryFactory() {
|
||||
return this.proxyRepositoryFactory;
|
||||
}
|
||||
|
||||
public void setProxyRepositoryFactory(IProxyRepositoryFactory proxyRepositoryFactory) {
|
||||
this.proxyRepositoryFactory = proxyRepositoryFactory;
|
||||
}
|
||||
|
||||
/**
|
||||
* Look for every linked items who use the selected id, no matter the version.
|
||||
* Usefull when want to delete an item since it will delete every versions.
|
||||
@@ -343,10 +309,10 @@ public class RelationshipItemBuilder {
|
||||
currentProjectItemsRelations = new HashMap<Relation, Set<Relation>>();
|
||||
referencesItemsRelations = new HashMap<Relation, Set<Relation>>();
|
||||
|
||||
loadRelations(currentProjectItemsRelations, getAimProject());
|
||||
Project currentProject = ProjectManager.getInstance().getCurrentProject();
|
||||
loadRelations(currentProjectItemsRelations, currentProject);
|
||||
|
||||
List<Project> referencedProjects = ProjectManager.getInstance().getReferencedProjects(getProxyRepositoryFactory(),
|
||||
getAimProject());
|
||||
List<Project> referencedProjects = ProjectManager.getInstance().getReferencedProjects();
|
||||
for (Project p : referencedProjects) {
|
||||
loadRelations(referencesItemsRelations, p);
|
||||
}
|
||||
@@ -400,7 +366,7 @@ public class RelationshipItemBuilder {
|
||||
if (!loaded && !modified) {
|
||||
return;
|
||||
}
|
||||
Project currentProject = getAimProject();
|
||||
Project currentProject = ProjectManager.getInstance().getCurrentProject();
|
||||
currentProject.getEmfProject().getItemsRelations().clear();
|
||||
|
||||
for (Relation relation : currentProjectItemsRelations.keySet()) {
|
||||
@@ -431,7 +397,10 @@ public class RelationshipItemBuilder {
|
||||
currentProject.getEmfProject().getItemsRelations().add(itemRelations);
|
||||
}
|
||||
try {
|
||||
getProxyRepositoryFactory().saveProject(currentProject);
|
||||
IRepositoryService service = (IRepositoryService) GlobalServiceRegister.getDefault().getService(
|
||||
IRepositoryService.class);
|
||||
IProxyRepositoryFactory factory = service.getProxyRepositoryFactory();
|
||||
factory.saveProject(currentProject);
|
||||
} catch (PersistenceException e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
@@ -466,12 +435,8 @@ public class RelationshipItemBuilder {
|
||||
}
|
||||
|
||||
public void clearAllItemsRelations() {
|
||||
if (currentProjectItemsRelations != null) {
|
||||
currentProjectItemsRelations.clear();
|
||||
}
|
||||
if (referencesItemsRelations != null) {
|
||||
referencesItemsRelations.clear();
|
||||
}
|
||||
currentProjectItemsRelations.clear();
|
||||
referencesItemsRelations.clear();
|
||||
}
|
||||
|
||||
public void mergeRelationship(Map<Relation, Set<Relation>> itemRelations, Map<Relation, Set<Relation>> newRelations) {
|
||||
@@ -505,7 +470,7 @@ public class RelationshipItemBuilder {
|
||||
|
||||
private Map<Relation, Set<Relation>> getRelatedRelations(Item baseItem) {
|
||||
Map<Relation, Set<Relation>> itemRelations = currentProjectItemsRelations;
|
||||
if (!ProjectManager.getInstance().isInMainProject(getAimProject(), baseItem)) {
|
||||
if (!ProjectManager.getInstance().isInCurrentMainProject(baseItem)) {
|
||||
itemRelations = referencesItemsRelations;
|
||||
}
|
||||
return itemRelations;
|
||||
@@ -526,7 +491,8 @@ public class RelationshipItemBuilder {
|
||||
}
|
||||
}
|
||||
|
||||
IProxyRepositoryFactory factory = getProxyRepositoryFactory();
|
||||
IRepositoryService service = (IRepositoryService) GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
|
||||
IProxyRepositoryFactory factory = service.getProxyRepositoryFactory();
|
||||
List<IRepositoryViewObject> list = new ArrayList<IRepositoryViewObject>();
|
||||
try {
|
||||
for (ERepositoryObjectType curTyp : getTypes()) {
|
||||
@@ -572,12 +538,12 @@ public class RelationshipItemBuilder {
|
||||
|
||||
public void updateItemVersion(Item baseItem, String oldVersion, String id, Map<String, String> versions,
|
||||
boolean avoidSaveProject) throws PersistenceException {
|
||||
IProxyRepositoryFactory factory = getProxyRepositoryFactory();
|
||||
IProxyRepositoryFactory factory = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
|
||||
IRepositoryViewObject obj = factory.getSpecificVersion(id, oldVersion, avoidSaveProject);
|
||||
Item item = obj.getProperty().getItem();
|
||||
// String itemVersion = item.getProperty().getVersion();
|
||||
Project currentProject = getAimProject();
|
||||
Project project = new Project(ProjectManager.getInstance().getProject(currentProject, item));
|
||||
Project currentProject = ProjectManager.getInstance().getCurrentProject();
|
||||
Project project = new Project(ProjectManager.getInstance().getProject(item));
|
||||
if (!loaded) {
|
||||
loadRelations();
|
||||
}
|
||||
|
||||
@@ -1369,6 +1369,10 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
|
||||
if (ERepositoryObjectType.PROCESS_ROUTELET != null) {
|
||||
allTypes.add(ERepositoryObjectType.PROCESS_ROUTELET);
|
||||
}
|
||||
// testContainer is also instance of process
|
||||
if (ERepositoryObjectType.TEST_CONTAINER != null) {
|
||||
allTypes.add(ERepositoryObjectType.TEST_CONTAINER);
|
||||
}
|
||||
|
||||
return allTypes;
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ public class FakePropertyImpl extends PropertyImpl {
|
||||
public FakePropertyImpl() {
|
||||
Context ctx = CoreRuntimePlugin.getInstance().getContext();
|
||||
RepositoryContext repoContext = (RepositoryContext) ctx.getProperty(Context.REPOSITORY_CONTEXT_KEY);
|
||||
this.setId("1");
|
||||
|
||||
this.setAuthor(repoContext.getUser());
|
||||
setVersion(""); //$NON-NLS-1$
|
||||
setCreationDate(new Date());
|
||||
|
||||
@@ -0,0 +1,120 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// 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.runtime.conf;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.net.URL;
|
||||
|
||||
import org.apache.commons.lang.ArrayUtils;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.eclipse.core.runtime.FileLocator;
|
||||
import org.eclipse.core.runtime.Path;
|
||||
import org.json.simple.JSONObject;
|
||||
import org.json.simple.parser.JSONParser;
|
||||
import org.json.simple.parser.ParseException;
|
||||
import org.osgi.framework.Bundle;
|
||||
import org.osgi.framework.FrameworkUtil;
|
||||
|
||||
/**
|
||||
* created by ycbai on Jul 31, 2014 Detailled comment
|
||||
*
|
||||
* <p>
|
||||
* This class is used to resolve the default configuration file to get the default value. The configuration file must be
|
||||
* the json format. You can use {@link #getDefaultConfValue(String... args)} method to get the default value. Subclasses
|
||||
* should give their special configuration file to make it work.
|
||||
* </p>
|
||||
*
|
||||
*/
|
||||
public abstract class DefaultConfsManager {
|
||||
|
||||
private Logger logger = Logger.getLogger(getClass());
|
||||
|
||||
private String confFilePath;
|
||||
|
||||
private Object confObj;
|
||||
|
||||
protected DefaultConfsManager(String confFilePath) {
|
||||
this.confFilePath = confFilePath;
|
||||
}
|
||||
|
||||
/**
|
||||
* DOC ycbai Comment method "getDefaultConfValue".
|
||||
*
|
||||
* @param args are the arguments which used to find the default config value.
|
||||
* @return the default configuration value.
|
||||
*/
|
||||
public String getDefaultConfValue(String... args) {
|
||||
Object val = getValue(args);
|
||||
if (val == null) {
|
||||
return null;
|
||||
}
|
||||
return String.valueOf(val);
|
||||
}
|
||||
|
||||
private Object getValue(String... args) {
|
||||
Object value = null;
|
||||
if (args == null) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
if (confObj == null) {
|
||||
initConfObj();
|
||||
}
|
||||
value = getValue(confObj, args);
|
||||
} catch (Exception e) {
|
||||
logger.warn("Fail to get the default value from \"" + confFilePath + "\". Please check it.", e); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
private static Object getValue(Object object, String... args) {
|
||||
if (args.length > 0 && object instanceof JSONObject) {
|
||||
String arg = args[0];
|
||||
Object obj = ((JSONObject) object).get(arg);
|
||||
String[] newArgs = (String[]) ArrayUtils.remove(args, 0);
|
||||
return getValue(obj, newArgs);
|
||||
} else {
|
||||
return object;
|
||||
}
|
||||
}
|
||||
|
||||
private void initConfObj() throws IOException, ParseException {
|
||||
Bundle b = FrameworkUtil.getBundle(getClass());
|
||||
URL url = FileLocator.toFileURL(FileLocator.find(b, new Path(confFilePath), null));
|
||||
if (url != null) {
|
||||
FileInputStream in = null;
|
||||
BufferedReader reader = null;
|
||||
try {
|
||||
in = new FileInputStream(url.getPath());
|
||||
reader = new BufferedReader(new InputStreamReader(in));
|
||||
JSONParser parser = new JSONParser();
|
||||
Object fileObj = parser.parse(reader);
|
||||
confObj = ((JSONObject) fileObj).get(getRootElement());
|
||||
} finally {
|
||||
if (in != null) {
|
||||
in.close();
|
||||
}
|
||||
if (reader != null) {
|
||||
reader.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected abstract String getRootElement();
|
||||
|
||||
}
|
||||
@@ -22,29 +22,28 @@ public interface IHDConstants {
|
||||
*/
|
||||
static final String DISTRIBUTION_CUSTOM = "CUSTOM";
|
||||
|
||||
/**
|
||||
* same as IHortonworksDistribution.DISTRIBUTION_NAME
|
||||
*/
|
||||
static final String DISTRIBUTION_HORTONWORKS = "HORTONWORKS";
|
||||
|
||||
/**
|
||||
* same as IAmazonEMRDistribution.DISTRIBUTION_NAME
|
||||
*/
|
||||
static final String DISTRIBUTION_AMAZON_EMR = "AMAZON_EMR";
|
||||
|
||||
/**
|
||||
* must be full class name of {@link HadoopComponent}
|
||||
*/
|
||||
static final String SERVICE_HADOOP = "org.talend.hadoop.distribution.component.HadoopComponent";
|
||||
|
||||
/**
|
||||
* must be full class name of {@link MRComponent}
|
||||
*/
|
||||
static final String SERVICE_MR = "org.talend.hadoop.distribution.component.MRComponent";
|
||||
|
||||
/**
|
||||
* must be full class name of {@link SparkComponent}
|
||||
*/
|
||||
static final String SERVICE_SPARK = "org.talend.hadoop.distribution.component.SparkComponent";
|
||||
|
||||
/**
|
||||
* must be full class name of {@link SparkBatchComponent}
|
||||
*/
|
||||
static final String SERVICE_SPARK_BATCH = "org.talend.hadoop.distribution.component.SparkBatchComponent";
|
||||
|
||||
/**
|
||||
* must be full class name of {@link SparkStreamingComponent}
|
||||
*/
|
||||
static final String SERVICE_SPARK_STREAMING = "org.talend.hadoop.distribution.component.SparkStreamingComponent";
|
||||
|
||||
}
|
||||
|
||||
@@ -22,6 +22,4 @@ public interface IHDistributionVersion {
|
||||
String getVersion();
|
||||
|
||||
String getDisplayVersion();
|
||||
|
||||
String getDefaultConfig(String... keys);
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
package org.talend.core.runtime.hd.hive;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
@@ -85,22 +86,22 @@ public class HiveMetadataHelper {
|
||||
List<String> versionsItems = new ArrayList<String>();
|
||||
IHDistribution distribution = getDistribution(hiveDistribution, byDisplay);
|
||||
if (distribution != null) {
|
||||
IHDistributionVersion[] hdVersions = distribution.getHDVersions();
|
||||
for (IHDistributionVersion v : hdVersions) {
|
||||
String[] hiveModesDisplay = getHiveModesDisplay(distribution.getName(), v.getVersion(), null, false);
|
||||
if (hiveModesDisplay == null || hiveModesDisplay.length == 0) {
|
||||
continue; // if no hive mode to support, ignore this version?
|
||||
}
|
||||
// String[] hiveServersDisplay = getHiveServersDisplay(distribution.getName(), v.getVersion(), false);
|
||||
// if (hiveServersDisplay == null || hiveServersDisplay.length == 0) {
|
||||
// continue; // if no hive server to support, ignore this version?
|
||||
// }
|
||||
String displayVersion = v.getDisplayVersion();
|
||||
if (displayVersion != null) {
|
||||
versionsItems.add(displayVersion);
|
||||
}
|
||||
}
|
||||
// versionsItems.addAll(Arrays.asList(distribution.getVersionsDisplay()));
|
||||
// IHDistributionVersion[] hdVersions = distribution.getHDVersions();
|
||||
// for (IHDistributionVersion v : hdVersions) {
|
||||
// String[] hiveModesDisplay = getHiveModesDisplay(distribution.getName(), v.getVersion(), null, false);
|
||||
// if (hiveModesDisplay == null || hiveModesDisplay.length == 0) {
|
||||
// continue; // if no hive mode to support, ignore this version?
|
||||
// }
|
||||
// String[] hiveServersDisplay = getHiveServersDisplay(distribution.getName(), v.getVersion(), false);
|
||||
// if (hiveServersDisplay == null || hiveServersDisplay.length == 0) {
|
||||
// continue; // if no hive server to support, ignore this version?
|
||||
// }
|
||||
// String displayVersion = v.getDisplayVersion();
|
||||
// if (displayVersion != null) {
|
||||
// versionsItems.add(displayVersion);
|
||||
// }
|
||||
// }
|
||||
versionsItems.addAll(Arrays.asList(distribution.getVersionsDisplay()));
|
||||
}
|
||||
return versionsItems.toArray(new String[versionsItems.size()]);
|
||||
}
|
||||
@@ -180,9 +181,9 @@ public class HiveMetadataHelper {
|
||||
String hiveServerVersion, boolean byDisplay) {
|
||||
HiveModeInfo hiveModeInfo = byDisplay ? HiveModeInfo.getByDisplay(hiveMode) : HiveModeInfo.get(hiveMode);
|
||||
HiveServerVersionInfo hiveServerVersionInfo = byDisplay ? HiveServerVersionInfo.getByDisplay(hiveServerVersion)
|
||||
: HiveServerVersionInfo.getByKey(hiveServerVersion); // same as DatabaseForm
|
||||
: HiveServerVersionInfo.valueOf(hiveServerVersion);
|
||||
|
||||
boolean supportSecurity = doSupportMethod(hiveDistribution, hiveVersion, byDisplay, "doSupportKerberos");//$NON-NLS-1$
|
||||
boolean supportSecurity = doSupportMethod(hiveDistribution, hiveVersion, byDisplay, "doSupportSecurity");//$NON-NLS-1$
|
||||
if (supportSecurity
|
||||
&& (HiveServerVersionInfo.HIVE_SERVER_2 == hiveServerVersionInfo || hiveModeInfo == HiveModeInfo.EMBEDDED)) {
|
||||
return true;
|
||||
|
||||
@@ -96,16 +96,7 @@ public class JobInfoProperties extends Properties {
|
||||
|
||||
setProperty(JOB_ID, jobInfo.getJobId());
|
||||
setProperty(JOB_NAME, jobInfo.getJobName());
|
||||
String jobType = processItem.getProcess().getJobType();
|
||||
if (jobType == null) {
|
||||
/*
|
||||
* should call ConvertJobsUtil.getJobTypeFromFramework(processItem)
|
||||
*
|
||||
* ConvertJobsUtil.JobType.STANDARD.getDisplayName
|
||||
*/
|
||||
jobType = "Standard"; //$NON-NLS-1$
|
||||
}
|
||||
setProperty(JOB_TYPE, jobType);
|
||||
setProperty(JOB_TYPE, processItem.getProcess().getJobType());
|
||||
setProperty(JOB_VERSION, jobInfo.getJobVersion());
|
||||
setProperty(CONTEXT_NAME, this.contextName);
|
||||
setProperty(DATE, DATAFORMAT.format(new Date()));
|
||||
|
||||
@@ -53,8 +53,6 @@ public interface IProjectSettingTemplateConstants {
|
||||
final static String ASSEMBLY_JOB_TEMPLATE_FILE_NAME = "assembly_job_template.xml";
|
||||
|
||||
final static String PROJECT_TEMPLATE_FILE_NAME = "pom_project_template.xml";
|
||||
|
||||
final static String POM_TEST_ROUTE_TEMPLATE_FILE_NAME = "pom_test_route_template.xml";
|
||||
|
||||
final static String MAVEN_USER_SETTING_TEMPLATE_FILE_NAME = "maven_user_settings.xml";
|
||||
|
||||
|
||||
@@ -16,10 +16,8 @@ import java.io.InputStream;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.avro.Schema;
|
||||
import org.talend.components.api.component.ComponentDefinition;
|
||||
import org.talend.components.api.component.ComponentImageType;
|
||||
import org.talend.components.api.component.Connector;
|
||||
import org.talend.components.api.properties.ComponentProperties;
|
||||
import org.talend.components.api.service.ComponentService;
|
||||
import org.talend.components.api.wizard.ComponentWizard;
|
||||
@@ -162,6 +160,12 @@ public class ComponentServiceWithValueEvaluator implements ComponentService {
|
||||
return service.validateProperty(propName, properties);
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
public ComponentProperties commitFormValues(ComponentProperties properties, String formName) {
|
||||
// to delete
|
||||
return null;
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
@@ -171,31 +175,8 @@ public class ComponentServiceWithValueEvaluator implements ComponentService {
|
||||
*/
|
||||
@Override
|
||||
public ComponentProperties cancelFormValues(ComponentProperties arg0, String arg1) {
|
||||
return service.cancelFormValues(arg0, arg1);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.talend.components.api.service.ComponentService#getSchema(org.talend.components.api.properties.ComponentProperties, org.talend.components.api.component.Connector, boolean)
|
||||
*/
|
||||
@Override
|
||||
public Schema getSchema(ComponentProperties arg0, Connector arg1, boolean arg2) {
|
||||
return service.getSchema(arg0, arg1, arg2);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.talend.components.api.service.ComponentService#getAvailableConnectors(org.talend.components.api.properties.ComponentProperties, java.util.Set, boolean)
|
||||
*/
|
||||
@Override
|
||||
public Set<? extends Connector> getAvailableConnectors(ComponentProperties arg0, Set<? extends Connector> arg1, boolean arg2) {
|
||||
return service.getAvailableConnectors(arg0, arg1, arg2);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.talend.components.api.service.ComponentService#setSchema(org.talend.components.api.properties.ComponentProperties, org.talend.components.api.component.Connector, org.apache.avro.Schema, boolean)
|
||||
*/
|
||||
@Override
|
||||
public void setSchema(ComponentProperties arg0, Connector arg1, Schema arg2, boolean arg3) {
|
||||
service.setSchema(arg0, arg1, arg2, arg3);
|
||||
// to implement
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -23,7 +23,6 @@ import org.talend.core.model.metadata.builder.connection.Connection;
|
||||
import org.talend.core.model.metadata.builder.connection.MetadataTable;
|
||||
import org.talend.core.model.process.EComponentCategory;
|
||||
import org.talend.core.model.process.Element;
|
||||
import org.talend.core.model.process.INode;
|
||||
import org.talend.core.model.properties.Item;
|
||||
import org.talend.core.model.repository.ERepositoryObjectType;
|
||||
import org.talend.repository.model.RepositoryNode;
|
||||
@@ -108,9 +107,11 @@ public interface IGenericWizardService extends IService {
|
||||
* Update component schema for node metadata table of node.
|
||||
*
|
||||
* @param componentProperties
|
||||
* @param schemaPropertyName
|
||||
* @param metadataTable
|
||||
*/
|
||||
public void updateComponentSchema(INode node, IMetadataTable metadataTable);
|
||||
public void updateComponentSchema(ComponentProperties componentProperties, String schemaPropertyName,
|
||||
IMetadataTable metadataTable);
|
||||
|
||||
public List<ComponentProperties> getAllComponentProperties(Connection connection);
|
||||
|
||||
|
||||
@@ -21,7 +21,6 @@ import org.eclipse.core.runtime.IPath;
|
||||
import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.core.IService;
|
||||
import org.talend.core.model.components.IComponent;
|
||||
import org.talend.core.model.general.Project;
|
||||
import org.talend.core.model.process.INode;
|
||||
import org.talend.core.model.process.IProcess;
|
||||
import org.talend.core.model.process.IProcess2;
|
||||
@@ -51,11 +50,7 @@ public interface ITestContainerProviderService extends IService {
|
||||
|
||||
public boolean hasTestCase(Property property);
|
||||
|
||||
public boolean hasTestCase(Project project, Property property);
|
||||
|
||||
public ProcessType getTestContainerProcess(Item item);
|
||||
|
||||
public void setTestContainerProcess(ProcessType process,Item item);
|
||||
|
||||
public Item getParentJobItem(Item item) throws PersistenceException;
|
||||
|
||||
@@ -97,7 +92,7 @@ public interface ITestContainerProviderService extends IService {
|
||||
|
||||
public void copyTestCase(Item jobItem, Item testItem, IPath path, String newName, boolean isDuplicate);
|
||||
|
||||
public void copyDataFiles(Item newItem, String sourceNodeid);
|
||||
public void copyDataFiles(Item newItem, RepositoryNode sourceNode);
|
||||
|
||||
public String getDataFileSourcePath(Item item, String dataValue);
|
||||
|
||||
|
||||
@@ -152,8 +152,6 @@ public class RepositoryImageProvider {
|
||||
return ECoreImage.TDQ_INDICATOR_ICON;
|
||||
} else if (type == ERepositoryObjectType.TDQ_DATA_PROFILING) {
|
||||
return ECoreImage.TDQ_DATA_PROFILING_ICON;
|
||||
} else if (type == ERepositoryObjectType.TDQ_LIBRARIES) {
|
||||
return ECoreImage.TDQ_LIBRARIES_ICON;
|
||||
} else {
|
||||
IImage image = null;
|
||||
for (IRepositoryContentHandler handler : RepositoryContentManager.getHandlers()) {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user