Compare commits
1 Commits
bugfix/mas
...
release/7.
| Author | SHA1 | Date | |
|---|---|---|---|
|
cea6cfbf2a |
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.common.ui.runtime.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.runtime.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.ui.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.repository.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.runtime.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.ui.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.cwm.mip.edit.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.cwm.mip.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.ui.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.help.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.helpers.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.librariesmanager.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.librariesmanager.ui.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.metadata.managment.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.metadata.managment.ui.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.migrationTool.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.model.edit.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.model.migration.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.model.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.presentation.onboarding.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.registration.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.items.importexport.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.localprovider.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.mdm.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.metadata.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.view.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.resources.nl</artifactId>
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
</url>
|
||||
<requires>
|
||||
<import feature="org.talend.model.migration.feature" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.bouncycastle.bcprov" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="com.fasterxml.jackson.core.jackson-databind" version="2.9.8" match="greaterOrEqual"/>
|
||||
<import plugin="bcprov" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="com.fasterxml.jackson.core.jackson-databind" version="2.9.5" match="greaterOrEqual"/>
|
||||
<import plugin="jackson-core-asl" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="jackson-mapper-asl" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.apache.xalan" version="0.0.0" match="greaterOrEqual"/>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.feature</artifactId>
|
||||
|
||||
@@ -26,9 +26,7 @@
|
||||
<import feature="org.talend.utils.feature" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="javax.activation" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="javax.mail" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="javax.xml.bind" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="javax.xml.soap" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="javax.xml.ws" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="net.jeeeyul.eclipse.themes" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="net.jeeeyul.swtend" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.apache.commons.collections" version="0.0.0" match="greaterOrEqual"/>
|
||||
@@ -36,9 +34,15 @@
|
||||
<import plugin="org.apache.commons.io" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.apache.httpcomponents.httpclient" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.apache.httpcomponents.httpcore" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.aether.api" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.aether.connector.basic" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.aether.impl" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.aether.spi" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.aether.transport.file" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.aether.transport.http" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.aether.util" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.compare" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.compare.core" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.m2m.atl.emftvm.trace" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.ops4j.pax.url.mvn" version="0.0.0" match="greaterOrEqual"/>
|
||||
</requires>
|
||||
<plugin id="org.talend.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
@@ -66,8 +70,8 @@
|
||||
<plugin id="org.talend.model" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
<plugin id="org.talend.model.edit" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
<plugin id="org.talend.model.edit.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.model.migration" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
<plugin id="org.talend.model.migration.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin download-size="0" install-size="0" version="0.0.0" unpack="false" id="org.talend.model.migration"/>
|
||||
<plugin download-size="0" install-size="0" version="0.0.0" unpack="false" id="org.talend.model.migration.nl"/>
|
||||
<plugin id="org.talend.model.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.osgi.lib.loader" download-size="0" install-size="0" version="0.0.0" unpack="false" fragment="true"/>
|
||||
<plugin id="org.talend.resources" download-size="0" install-size="0" version="0.0.0"/>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.feature</artifactId>
|
||||
|
||||
@@ -16,6 +16,13 @@
|
||||
[Enter License Description here.]
|
||||
</license>
|
||||
|
||||
<plugin
|
||||
id="org.talend.libraries.nattable.glazedlist"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
fragment="true"/>
|
||||
|
||||
<plugin
|
||||
id="org.talend.developpement"
|
||||
download-size="0"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.fragment.jars.common.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.help.feature</artifactId>
|
||||
|
||||
@@ -5,8 +5,7 @@
|
||||
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
|
||||
<license url="http://www.example.com/license">[Enter License Description here.]</license>
|
||||
<requires>
|
||||
<!-- bonita requires org.codehaus.groovy version 2.4.16.xx-201812291959-e2018-12-RELEASE -->
|
||||
<import plugin="org.codehaus.groovy" version="2.4.16.xx-201812291959-e2018-12-RELEASE" match="perfect"/>
|
||||
<import plugin="org.codehaus.groovy" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.ant.launching" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.ant.ui" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.jdt" version="0.0.0" match="greaterOrEqual"/>
|
||||
@@ -31,6 +30,6 @@
|
||||
<import plugin="org.hamcrest.core" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.junit" version="0.0.0" match="greaterOrEqual"/>
|
||||
</requires>
|
||||
<plugin id="org.eclipse.jdt.launching.macosx" os="macosx" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
<plugin id="org.eclipse.jdt.launching.ui.macosx" os="macosx" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
<plugin id="org.eclipse.jdt.launching.macosx" os="macosx" download-size="17" install-size="28" version="3.2.300.v20130801-1441" unpack="false"/>
|
||||
<plugin id="org.eclipse.jdt.launching.ui.macosx" os="macosx" download-size="55" install-size="101" version="1.0.300.v20130801-1441" unpack="false"/>
|
||||
</feature>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.jdt.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.jdbc.feature</artifactId>
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
|
||||
<license url="http://www.example.com/license">[Enter License Description here.]</license>
|
||||
<requires>
|
||||
<import feature="org.eclipse.equinox.p2.discovery.feature" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import feature="org.eclipse.wst.common.fproj" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import feature="org.eclipse.wst.common_core.feature" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import feature="org.eclipse.wst.xml_core.feature" version="0.0.0" match="greaterOrEqual"/>
|
||||
@@ -19,7 +18,6 @@
|
||||
<import plugin="org.eclipse.m2e.archetype.common" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.m2e.core" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.m2e.core.ui" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.m2e.discovery" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.m2e.editor" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.m2e.editor.xml" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.m2e.jdt" version="0.0.0" match="greaterOrEqual"/>
|
||||
@@ -34,9 +32,7 @@
|
||||
<import plugin="org.eclipse.m2e.profiles.ui" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.m2e.refactoring" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.m2e.scm" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.m2e.workspace.cli" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.slf4j.impl.log4j12" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.wst.server.discovery" version="0.0.0" match="greaterOrEqual"/>
|
||||
</requires>
|
||||
</feature>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.m2e.feature</artifactId>
|
||||
|
||||
@@ -7,6 +7,6 @@
|
||||
<requires>
|
||||
<import feature="org.eclipse.m2m.atl" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import feature="org.talend.utils.feature" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.bouncycastle.bcprov" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="bcprov" version="0.0.0" match="greaterOrEqual"/>
|
||||
</requires>
|
||||
</feature>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.model.migration.feature</artifactId>
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
<import plugin="org.eclipse.core.filesystem" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.core.net" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.core.runtime.compatibility" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.core.runtime.compatibility.registry" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.core.variables" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.debug.core" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.debug.ui" version="0.0.0" match="greaterOrEqual"/>
|
||||
@@ -45,7 +47,6 @@
|
||||
<import plugin="org.eclipse.ui.ide" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.ui.ide.application" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.ui.intro" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.ui.intro.quicklinks" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.ui.intro.universal" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.ui.navigator" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.ui.navigator.resources" version="0.0.0" match="greaterOrEqual"/>
|
||||
@@ -55,15 +56,28 @@
|
||||
<import plugin="org.eclipse.ui.views.properties.tabbed" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.ui.workbench.texteditor" version="0.0.0" match="greaterOrEqual"/>
|
||||
</requires>
|
||||
<plugin id="org.eclipse.compare.win32" os="win32" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.filesystem.linux.x86_64" os="linux" arch="x86_64" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.filesystem.macosx" os="macosx" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.filesystem.win32.x86_64" os="win32" arch="x86_64" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.net.linux.x86_64" os="linux" arch="x86_64" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.net.win32.x86_64" os="win32" arch="x86_64" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.resources.win32.x86_64" os="win32" arch="x86_64" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.equinox.security.macosx" os="macosx" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.equinox.security.win32.x86_64" os="win32" arch="x86_64" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.ui.win32" os="win32" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.compare.win32" os="win32" download-size="38" install-size="71" version="1.0.200.v20130514-1224" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.filesystem.aix.ppc" os="aix" arch="ppc" download-size="9" install-size="17" version="1.1.0.v20140124-1940" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.filesystem.aix.ppc64" os="aix" arch="ppc64" download-size="9" install-size="18" version="1.1.0.v20140124-1940" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.filesystem.hpux.ia64" os="hpux" arch="ia64" download-size="20" install-size="102" version="1.1.0.v20140124-1940" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.filesystem.linux.ppc" os="linux" arch="ppc" download-size="22" install-size="52" version="1.0.200.v20140124-1940" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.filesystem.linux.ppc64" os="linux" arch="ppc64" download-size="10" install-size="21" version="1.4.0.v20140124-1940" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.filesystem.linux.ppc64le" os="linux" arch="ppc64le" download-size="10" install-size="20" version="1.4.0.v20140808-1353" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.filesystem.linux.x86" os="linux" arch="x86" download-size="10" install-size="17" version="1.4.200.v20140124-1940" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.filesystem.linux.x86_64" os="linux" arch="x86_64" download-size="10" install-size="19" version="1.2.200.v20140124-1940" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.filesystem.macosx" os="macosx" download-size="13" install-size="64" version="1.3.0.v20140124-1940" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.filesystem.solaris.sparc" os="solaris" arch="sparc" download-size="9" install-size="16" version="1.2.0.v20140124-1940" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.filesystem.win32.x86" os="win32" arch="x86" download-size="26" install-size="54" version="1.4.0.v20140124-1940" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.filesystem.win32.x86_64" os="win32" arch="x86_64" download-size="31" install-size="64" version="1.4.0.v20140124-1940" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.net.linux.x86" os="linux" arch="x86" download-size="36" install-size="95" version="1.1.300.v20140124-2013" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.net.linux.x86_64" os="linux" arch="x86_64" download-size="37" install-size="100" version="1.1.100.v20140124-2013" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.net.win32.x86" os="win32" arch="x86" download-size="29" install-size="54" version="1.0.100.v20140124-2013" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.net.win32.x86_64" os="win32" arch="x86_64" download-size="28" install-size="54" version="1.0.100.v20140124-2013" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.resources.win32.x86" os="win32" arch="x86" download-size="17" install-size="42" version="3.5.100.v20140124-1940" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.core.resources.win32.x86_64" os="win32" arch="x86_64" download-size="26" install-size="53" version="3.5.0.v20140124-1940" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.equinox.security.macosx" os="macosx" download-size="16" install-size="58" version="1.100.200.v20130327-1442" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.equinox.security.win32.x86" os="win32" arch="x86" download-size="22" install-size="47" version="1.0.300.v20130327-1442" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.equinox.security.win32.x86_64" os="win32" arch="x86_64" download-size="34" install-size="65" version="1.0.100.v20130327-1442" fragment="true" unpack="false"/>
|
||||
<plugin id="org.eclipse.ui.win32" os="win32" download-size="24" install-size="48" version="3.2.400.v20140423-2207" fragment="true" unpack="false"/>
|
||||
<plugin id="org.talend.platform.logging" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
</feature>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
<import plugin="net.jeeeyul.eclipse.themes" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="net.jeeeyul.swtend" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.ui.views.log" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.eclipse.urischeme" version="0.0.0" match="greaterOrEqual"/>
|
||||
</requires>
|
||||
<plugin id="org.talend.rcp" download-size="0" install-size="0" version="0.0.0"/>
|
||||
<plugin id="org.talend.rcp.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.update.p2.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.updates.feature</artifactId>
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
|
||||
<license url="http://www.example.com/license">[Enter License Description here.]</license>
|
||||
<requires>
|
||||
<import plugin="org.bouncycastle.bcprov" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="bcprov" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="com.cedarsoftware.json-io" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.9.0" match="greaterOrEqual"/>
|
||||
<import plugin="com.fasterxml.jackson.core.jackson-core" version="2.9.8" match="greaterOrEqual"/>
|
||||
<import plugin="com.fasterxml.jackson.core.jackson-core" version="2.9.5" match="greaterOrEqual"/>
|
||||
<import plugin="com.thoughtworks.paranamer" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="jackson-core-asl" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="jackson-mapper-asl" version="0.0.0" match="greaterOrEqual"/>
|
||||
@@ -22,6 +22,5 @@
|
||||
<import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
|
||||
</requires>
|
||||
<plugin id="org.talend.daikon" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
<plugin id="org.talend.daikon.exception" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
<plugin id="org.talend.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
</feature>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.utils.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.common.ui.runtime</artifactId>
|
||||
|
||||
@@ -54,7 +54,9 @@ public final class MessageBoxExceptionHandler {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
process(ex, display.getActiveShell());
|
||||
Shell shell = display.getActiveShell() == null ? new Shell() : display.getActiveShell();
|
||||
process(ex, shell);
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -23,7 +23,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.graphics.Image;
|
||||
import org.eclipse.swt.graphics.ImageData;
|
||||
import org.eclipse.swt.graphics.ImageDataProvider;
|
||||
import org.eclipse.swt.graphics.ImageLoader;
|
||||
import org.eclipse.swt.graphics.Point;
|
||||
import org.talend.commons.ui.runtime.exception.ExceptionHandler;
|
||||
@@ -104,7 +103,7 @@ public class ImageUtils {
|
||||
* RAP.
|
||||
*/
|
||||
public static Image scale(Image image, int percent) {
|
||||
float scale = percent / 100f;
|
||||
float scale = (float) percent / 100f;
|
||||
int newWidth = (int) (scale * image.getImageData().width);
|
||||
int newHeight = (int) (scale * image.getImageData().height);
|
||||
ImageData imageData = image.getImageData().scaledTo(newWidth, newHeight);
|
||||
@@ -144,7 +143,7 @@ public class ImageUtils {
|
||||
return imageDes;
|
||||
}
|
||||
|
||||
private static Map<byte[], ImageDataProvider> imageFromDataCachedImages = new HashMap<byte[], ImageDataProvider>();
|
||||
private static Map<byte[], ImageData> imageFromDataCachedImages = new HashMap<byte[], ImageData>();
|
||||
|
||||
/**
|
||||
* By default, keep in memory the .
|
||||
@@ -155,14 +154,13 @@ public class ImageUtils {
|
||||
*/
|
||||
public static ImageDescriptor createImageFromData(byte[] data, boolean... keepInMemory) {
|
||||
if (data != null) {
|
||||
ImageDataProvider imageProvider = imageFromDataCachedImages.get(data);
|
||||
if (imageProvider == null) {
|
||||
ImageData img = imageFromDataCachedImages.get(data);
|
||||
if (img == null) {
|
||||
ByteArrayInputStream bais = new ByteArrayInputStream(data);
|
||||
ImageData img = new ImageData(bais);
|
||||
imageProvider = new TalendImageProvider(img);
|
||||
imageFromDataCachedImages.put(data, imageProvider);
|
||||
img = new ImageData(bais);
|
||||
imageFromDataCachedImages.put(data, img);
|
||||
}
|
||||
return ImageDescriptor.createFromImageDataProvider(imageProvider);
|
||||
return ImageDescriptor.createFromImageData(img);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@@ -285,11 +283,11 @@ public class ImageUtils {
|
||||
// if width is mort than height.
|
||||
if (w > h) {
|
||||
newSize.x = requiredSize.x;
|
||||
newSize.y = w >= 1 ? Math.round(originalSize.y / w) : Math.round(originalSize.y * w);
|
||||
newSize.y = (int) (w >= 1 ? Math.round(originalSize.y / w) : Math.round(originalSize.y * w));
|
||||
}
|
||||
// if width is less than height.
|
||||
else if (w < h) {
|
||||
newSize.x = h >= 1 ? Math.round(originalSize.x / h) : Math.round(originalSize.x * h);
|
||||
newSize.x = (int) (h >= 1 ? Math.round(originalSize.x / h) : Math.round(originalSize.x * h));
|
||||
newSize.y = requiredSize.y;
|
||||
}
|
||||
// if equal
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
package org.talend.commons.ui.runtime.image;
|
||||
|
||||
import org.eclipse.swt.graphics.ImageData;
|
||||
import org.eclipse.swt.graphics.ImageDataProvider;
|
||||
|
||||
public class TalendImageProvider implements ImageDataProvider {
|
||||
|
||||
private ImageData imageData;
|
||||
|
||||
public TalendImageProvider(ImageData imageData) {
|
||||
this.imageData = imageData;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ImageData getImageData(int zoom) {
|
||||
if (zoom == 100) {
|
||||
return imageData;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,175 +0,0 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
|
||||
//
|
||||
// This source code is available under agreement available at
|
||||
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
|
||||
//
|
||||
// You should have received a copy of the agreement
|
||||
// along with this program; if not, write to Talend SA
|
||||
// 9 rue Pages 92150 Suresnes, France
|
||||
//
|
||||
// ============================================================================
|
||||
package org.talend.commons.ui.runtime.utils;
|
||||
|
||||
/**
|
||||
* DOC Administrator class global comment. Detailled comment
|
||||
*/
|
||||
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.Enumeration;
|
||||
import java.util.jar.JarEntry;
|
||||
import java.util.jar.JarOutputStream;
|
||||
|
||||
import org.apache.tools.zip.ZipEntry;
|
||||
import org.apache.tools.zip.ZipFile;
|
||||
import org.talend.commons.ui.runtime.exception.ExceptionHandler;
|
||||
|
||||
public class ZipFileUtils {
|
||||
|
||||
private static int bufSize = 2048; // size of bytes
|
||||
|
||||
public static String zip(String zipDirectory) {
|
||||
File zipDir = new File(zipDirectory);
|
||||
return zip(zipDirectory, zipDir.getPath(), false);
|
||||
}
|
||||
|
||||
public static String zip(String zipDirectory, String zipFileName, boolean includeSelfDir) {
|
||||
File zipDir = new File(zipDirectory);
|
||||
File[] willZipFileArr;
|
||||
if (includeSelfDir || zipDir.isFile()) {
|
||||
willZipFileArr = new File[] { zipDir };
|
||||
} else {
|
||||
willZipFileArr = zipDir.listFiles();
|
||||
}
|
||||
return zip(willZipFileArr, zipFileName);
|
||||
}
|
||||
|
||||
public static String zip(File[] files, String zipFileName) {
|
||||
|
||||
JarOutputStream jarOutput = null;
|
||||
try {
|
||||
jarOutput = new JarOutputStream(new FileOutputStream(zipFileName));
|
||||
|
||||
for (File file : files) {
|
||||
zipFiles(file, jarOutput, "");
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
} finally {
|
||||
if (jarOutput != null) {
|
||||
try {
|
||||
jarOutput.close();
|
||||
} catch (IOException e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static void zipFiles(File file, JarOutputStream jos, String pathName) throws Exception {
|
||||
String fileName = pathName + file.getName();
|
||||
if (file.isDirectory()) {
|
||||
fileName = fileName + "/";
|
||||
jos.putNextEntry(new JarEntry(fileName));
|
||||
String fileNames[] = file.list();
|
||||
if (fileNames != null) {
|
||||
for (int i = 0; i < fileNames.length; i++) {
|
||||
zipFiles(new File(file, fileNames[i]), jos, fileName);
|
||||
}
|
||||
jos.closeEntry();
|
||||
}
|
||||
} else {
|
||||
JarEntry jarEntry = new JarEntry(fileName);
|
||||
BufferedInputStream in = new BufferedInputStream(new FileInputStream(file));
|
||||
jos.putNextEntry(jarEntry);
|
||||
|
||||
byte[] buf = new byte[bufSize];
|
||||
int len;
|
||||
while ((len = in.read(buf)) >= 0) {
|
||||
jos.write(buf, 0, len);
|
||||
}
|
||||
in.close();
|
||||
jos.closeEntry();
|
||||
}
|
||||
}
|
||||
|
||||
public static String unZip(File unZipFile) {
|
||||
return unZip(unZipFile.getPath(), null);
|
||||
}
|
||||
|
||||
public static String unZip(File unZipFile, String destFileName) {
|
||||
return unZip(unZipFile.getPath(), destFileName);
|
||||
}
|
||||
|
||||
public static String unZip(String unZipFileName) {
|
||||
return unZip(unZipFileName, null);
|
||||
}
|
||||
|
||||
public static String unZip(String unZipFileName, String destFileName) {
|
||||
File unzipFile = new File(unZipFileName);
|
||||
|
||||
if (destFileName == null || destFileName.trim().length() == 0) {
|
||||
destFileName = unzipFile.getParent();
|
||||
}
|
||||
|
||||
File destFile;
|
||||
ZipFile zipFile = null;
|
||||
try {
|
||||
zipFile = new ZipFile(unzipFile, "GBK");
|
||||
for (Enumeration entries = zipFile.getEntries(); entries.hasMoreElements();) {
|
||||
ZipEntry entry = (ZipEntry) entries.nextElement();
|
||||
destFile = new File(destFileName, entry.getName());
|
||||
|
||||
unZipFile(destFile, zipFile, entry);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
return e.getMessage();
|
||||
} finally {
|
||||
try {
|
||||
assert zipFile != null;
|
||||
zipFile.close();
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static void unZipFile(File destFile, ZipFile zipFile, ZipEntry entry) throws IOException {
|
||||
InputStream inputStream;
|
||||
FileOutputStream fileOut;
|
||||
if (entry.isDirectory()) {
|
||||
destFile.mkdirs();
|
||||
} else {
|
||||
File parent = destFile.getParentFile();
|
||||
if (parent != null && !parent.exists()) {
|
||||
parent.mkdirs();
|
||||
}
|
||||
|
||||
inputStream = zipFile.getInputStream(entry);
|
||||
|
||||
fileOut = new FileOutputStream(destFile);
|
||||
byte[] buf = new byte[bufSize];
|
||||
int readedBytes;
|
||||
while ((readedBytes = inputStream.read(buf)) > 0) {
|
||||
fileOut.write(buf, 0, readedBytes);
|
||||
}
|
||||
fileOut.close();
|
||||
|
||||
inputStream.close();
|
||||
}
|
||||
}
|
||||
|
||||
public void setBufSize(int bufSize) {
|
||||
ZipFileUtils.bufSize = bufSize;
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,7 @@ Require-Bundle: org.apache.log4j;visibility:=reexport,
|
||||
org.eclipse.core.runtime,
|
||||
org.eclipse.emf.ecore.xmi,
|
||||
org.talend.libraries.apache,
|
||||
org.apache.xerces,
|
||||
com.ibm.icu,
|
||||
org.apache.commons.io,
|
||||
org.talend.utils
|
||||
@@ -60,4 +61,3 @@ Bundle-ClassPath: .,
|
||||
fakejdbc_driver.jar
|
||||
Bundle-Vendor: .Talend SA.
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Import-Package: org.apache.xerces.jaxp
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.runtime</artifactId>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend</groupId>
|
||||
<artifactId>org.talend.tos</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../pom_server.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -17,10 +17,8 @@ import java.io.InputStream;
|
||||
import java.net.URL;
|
||||
|
||||
import org.apache.commons.lang.ArrayUtils;
|
||||
import org.eclipse.core.runtime.FileLocator;
|
||||
import org.eclipse.core.runtime.Platform;
|
||||
import org.eclipse.core.runtime.preferences.InstanceScope;
|
||||
import org.osgi.framework.Bundle;
|
||||
import org.osgi.framework.BundleActivator;
|
||||
import org.osgi.framework.BundleContext;
|
||||
import org.osgi.framework.ServiceReference;
|
||||
@@ -162,13 +160,4 @@ public class CommonsPlugin implements BundleActivator {
|
||||
InstanceScope.INSTANCE.getNode("org.eclipse.m2e.core").putBoolean("eclipse.m2.offline", state);
|
||||
}
|
||||
|
||||
public static URL getBundleRealURL(String bundleId) throws Exception {
|
||||
Bundle bundle = Platform.getBundle(bundleId);
|
||||
if (bundle == null) {
|
||||
return null;
|
||||
}
|
||||
URL entry = bundle.getEntry("/"); //$NON-NLS-1$
|
||||
return FileLocator.toFileURL(entry);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -123,10 +123,6 @@ public class FileCopyUtils {
|
||||
if (!resFolder.exists()) {
|
||||
return;
|
||||
}
|
||||
if (resFolder.getAbsolutePath().equals(destFolder.getAbsolutePath())) {// If the source path and target path are
|
||||
// same, don't copy
|
||||
return;
|
||||
}
|
||||
destFolder.mkdirs();
|
||||
String[] file = resFolder.list();
|
||||
File temp = null;
|
||||
|
||||
@@ -15,7 +15,6 @@ package org.talend.commons.runtime.xml;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
import javax.xml.XMLConstants;
|
||||
import javax.xml.parsers.DocumentBuilder;
|
||||
import javax.xml.parsers.DocumentBuilderFactory;
|
||||
import javax.xml.parsers.ParserConfigurationException;
|
||||
@@ -39,17 +38,11 @@ public class XSDValidator {
|
||||
|
||||
private static final String SCHEMA_VALIDATOR = "http://java.sun.com/xml/jaxp/properties/schemaSource"; //$NON-NLS-1$
|
||||
|
||||
private static final String PROTOCOL_PLATFORM = "platform"; //$NON-NLS-1$
|
||||
|
||||
private static final String PROTOCOL_FILE = "file"; //$NON-NLS-1$
|
||||
|
||||
public static Document checkXSD(File fileToCheck, File fileXSD) throws IOException, ParserConfigurationException,
|
||||
SAXException {
|
||||
final DocumentBuilderFactory fabrique = XmlUtils.getSecureDocumentBuilderFactory(false);
|
||||
fabrique.setAttribute(SCHEMA_LANGUAGE, "http://www.w3.org/2001/XMLSchema"); //$NON-NLS-1$
|
||||
fabrique.setAttribute(SCHEMA_VALIDATOR, fileXSD);
|
||||
fabrique.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, PROTOCOL_PLATFORM);
|
||||
fabrique.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, PROTOCOL_FILE);
|
||||
fabrique.setValidating(true);
|
||||
|
||||
Document document = null;
|
||||
|
||||
@@ -120,41 +120,33 @@ public class SAPHanaDataBaseMetadata extends FakeDatabaseMetaData {
|
||||
public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types)
|
||||
throws SQLException {
|
||||
String[] neededTypes = getNeededTypes(types);
|
||||
ResultSet rs = connection.getMetaData().getTables(catalog, schemaPattern, tableNamePattern, neededTypes);
|
||||
List<String[]> list = new ArrayList<String[]>();
|
||||
// has other types which is not Calculation View
|
||||
if (neededTypes.length > 1 || !ArrayUtils.contains(neededTypes, NEEDED_TYPES[3])) {
|
||||
ResultSet rs = connection.getMetaData().getTables(catalog, schemaPattern, tableNamePattern, neededTypes);
|
||||
while (rs.next()) {
|
||||
String name = rs.getString("TABLE_NAME"); //$NON-NLS-1$
|
||||
String schema = rs.getString("TABLE_SCHEM"); //$NON-NLS-1$
|
||||
String type = rs.getString("TABLE_TYPE"); //$NON-NLS-1$
|
||||
while (rs.next()) {
|
||||
String name = rs.getString("TABLE_NAME"); //$NON-NLS-1$
|
||||
String schema = rs.getString("TABLE_SCHEM"); //$NON-NLS-1$
|
||||
String type = rs.getString("TABLE_TYPE"); //$NON-NLS-1$
|
||||
|
||||
String id = ""; //$NON-NLS-1$
|
||||
String remarks = ""; //$NON-NLS-1$
|
||||
try {
|
||||
remarks = rs.getString("REMARKS"); //$NON-NLS-1$
|
||||
} catch (Exception e) {
|
||||
// nothing
|
||||
}
|
||||
String id = ""; //$NON-NLS-1$
|
||||
String remarks = ""; //$NON-NLS-1$
|
||||
try {
|
||||
remarks = rs.getString("REMARKS"); //$NON-NLS-1$
|
||||
} catch (Exception e) {
|
||||
// nothing
|
||||
}
|
||||
|
||||
if (ArrayUtils.contains(neededTypes, type)) {
|
||||
// check if the type is contained is in the types needed.
|
||||
// since sybase can return some system views as "SYSTEM VIEW" instead of "VIEW/TABLE" from the
|
||||
// request.
|
||||
String[] r = new String[] { id, schema, name, type, remarks, null };
|
||||
list.add(r);
|
||||
}
|
||||
if (ArrayUtils.contains(neededTypes, type)) {
|
||||
// check if the type is contained is in the types needed.
|
||||
// since sybase can return some system views as "SYSTEM VIEW" instead of "VIEW/TABLE" from the request.
|
||||
String[] r = new String[] { id, schema, name, type, remarks, null };
|
||||
list.add(r);
|
||||
}
|
||||
}
|
||||
|
||||
// For Calculation View
|
||||
if (ArrayUtils.contains(neededTypes, NEEDED_TYPES[3])) {
|
||||
// check if the type is contained is in the types needed.
|
||||
String sqlcv = "SELECT OBJECT_NAME,PACKAGE_ID FROM _SYS_REPO.ACTIVE_OBJECT WHERE OBJECT_SUFFIX = 'calculationview'"; //$NON-NLS-1$
|
||||
if (tableNamePattern != null && !tableNamePattern.equals("%")) { //$NON-NLS-1$
|
||||
sqlcv += " AND (OBJECT_NAME LIKE '" + tableNamePattern + "'"; //$NON-NLS-1$ //$NON-NLS-2$
|
||||
sqlcv += " OR PACKAGE_ID LIKE '" + tableNamePattern + "')"; //$NON-NLS-1$ //$NON-NLS-2$
|
||||
}
|
||||
String sqlcv = "SELECT CATALOG_NAME,SCHEMA_NAME,CUBE_NAME, COLUMN_OBJECT,CUBE_TYPE,DESCRIPTION from _SYS_BI.BIMC_CUBES"; //$NON-NLS-1$
|
||||
ResultSet rscv = null;
|
||||
Statement stmtcv = null;
|
||||
List<String[]> listcv = new ArrayList<String[]>();
|
||||
@@ -162,16 +154,25 @@ public class SAPHanaDataBaseMetadata extends FakeDatabaseMetaData {
|
||||
stmtcv = connection.createStatement();
|
||||
rscv = stmtcv.executeQuery(sqlcv);
|
||||
while (rscv.next()) {
|
||||
String objectName = rscv.getString("OBJECT_NAME"); //$NON-NLS-1$
|
||||
if (objectName != null) {
|
||||
objectName = objectName.trim();
|
||||
String catalogName = rscv.getString("CATALOG_NAME"); //$NON-NLS-1$
|
||||
if (catalogName != null) {
|
||||
catalogName = catalogName.trim();
|
||||
}
|
||||
String packageId = rscv.getString("PACKAGE_ID"); //$NON-NLS-1$
|
||||
if (packageId != null) {
|
||||
packageId = packageId.trim();
|
||||
String schemaName = rscv.getString("SCHEMA_NAME"); //$NON-NLS-1$
|
||||
if (schemaName != null) {
|
||||
schemaName = schemaName.trim();
|
||||
}
|
||||
String name = packageId + "/" + objectName; //$NON-NLS-1$
|
||||
String[] r = new String[] { "", "_SYS_BIC", name, NEEDED_TYPES[3], "", packageId }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
String cubeName = rscv.getString("CUBE_NAME"); //$NON-NLS-1$
|
||||
if (cubeName != null) {
|
||||
cubeName = cubeName.trim();
|
||||
}
|
||||
String id = ""; //$NON-NLS-1$
|
||||
// String type = rscv.getString("CUBE_TYPE"); //$NON-NLS-1$
|
||||
|
||||
String remarks = rscv.getString("DESCRIPTION"); //$NON-NLS-1$
|
||||
String name = catalogName + "/" + cubeName;//$NON-NLS-1$
|
||||
|
||||
String[] r = new String[] { id, schemaName, name, NEEDED_TYPES[3], remarks, catalogName };
|
||||
listcv.add(r);
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.ui</artifactId>
|
||||
|
||||
@@ -56,10 +56,6 @@ public class DisplayUtils {
|
||||
* @since 1.2
|
||||
*/
|
||||
public static Shell getDefaultShell() {
|
||||
return getDefaultShell(false);
|
||||
}
|
||||
|
||||
public static Shell getDefaultShell(boolean createIfNotExist) {
|
||||
Shell shell = null;
|
||||
|
||||
try {
|
||||
@@ -71,11 +67,7 @@ public class DisplayUtils {
|
||||
try {
|
||||
if (shell == null) {
|
||||
if (!PlatformUI.isWorkbenchRunning()) {
|
||||
if (createIfNotExist) {
|
||||
return new Shell();
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
return new Shell();
|
||||
}
|
||||
IWorkbenchWindow activeWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
|
||||
if (activeWindow != null) {
|
||||
@@ -89,11 +81,7 @@ public class DisplayUtils {
|
||||
|
||||
if (shell == null) {
|
||||
if (!PlatformUI.isWorkbenchRunning()) {
|
||||
if (createIfNotExist) {
|
||||
return new Shell();
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
return new Shell();
|
||||
}
|
||||
IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
|
||||
for (int i = 0; shell == null && i < windows.length; i++) {
|
||||
|
||||
@@ -18,8 +18,8 @@ import java.net.MalformedURLException;
|
||||
import java.net.URL;
|
||||
import java.util.Properties;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.eclipse.ui.internal.intro.impl.util.Log;
|
||||
import org.eclipse.ui.internal.intro.impl.util.StringUtil;
|
||||
|
||||
/**
|
||||
* DOC talend class global comment. Detailled comment
|
||||
@@ -165,12 +165,12 @@ public class DynamicURLParser {
|
||||
if (query.indexOf("&") != -1) {
|
||||
query = query.replaceAll("&", "&");
|
||||
}
|
||||
params = StringUtils.split(query, "&"); //$NON-NLS-1$
|
||||
params = StringUtil.split(query, "&"); //$NON-NLS-1$
|
||||
for (String param : params) {
|
||||
// for every parameter, ie: key=value pair, create a property
|
||||
// entry. we know we have the key as the first string in the array,
|
||||
// and the value as the second array.
|
||||
String[] keyValuePair = StringUtils.split(param, "="); //$NON-NLS-1$
|
||||
String[] keyValuePair = StringUtil.split(param, "="); //$NON-NLS-1$
|
||||
if (keyValuePair.length != 2) {
|
||||
Log.warning("Ignoring the following Intro URL parameter: " //$NON-NLS-1$
|
||||
+ param);
|
||||
|
||||
@@ -28,7 +28,6 @@ import org.eclipse.swt.widgets.Group;
|
||||
import org.eclipse.swt.widgets.Label;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.eclipse.swt.widgets.Text;
|
||||
import org.talend.commons.ui.gmf.util.DisplayUtils;
|
||||
import org.talend.commons.ui.runtime.i18n.Messages;
|
||||
|
||||
public class SSLDialog extends Dialog {
|
||||
@@ -145,18 +144,15 @@ public class SSLDialog extends Dialog {
|
||||
@Override
|
||||
protected void okPressed() {
|
||||
if (keyStoreText.getText().equals("")) {
|
||||
MessageDialog.openError(DisplayUtils.getDefaultShell(false), getShell().getText(),
|
||||
Messages.getString("SSLConfirmDialog.KeyStore")); //$NON-NLS-1$
|
||||
MessageDialog.openError(new Shell(), getShell().getText(), Messages.getString("SSLConfirmDialog.KeyStore")); //$NON-NLS-1$
|
||||
return;
|
||||
}
|
||||
if (passwordText.getText().equals("")) {
|
||||
MessageDialog.openError(DisplayUtils.getDefaultShell(false), getShell().getText(),
|
||||
Messages.getString("SSLConfirmDialog.TrustStore")); //$NON-NLS-1$
|
||||
MessageDialog.openError(new Shell(), getShell().getText(), Messages.getString("SSLConfirmDialog.TrustStore")); //$NON-NLS-1$
|
||||
return;
|
||||
}
|
||||
if (trustStoreText.getText().equals("")) {
|
||||
MessageDialog.openError(DisplayUtils.getDefaultShell(false), getShell().getText(),
|
||||
Messages.getString("SSLConfirmDialog.Password")); //$NON-NLS-1$
|
||||
MessageDialog.openError(new Shell(), getShell().getText(), Messages.getString("SSLConfirmDialog.Password")); //$NON-NLS-1$
|
||||
return;
|
||||
}
|
||||
keyStorePath = keyStoreText.getText();
|
||||
@@ -195,7 +191,7 @@ public class SSLDialog extends Dialog {
|
||||
dialog.setFilterPath("");
|
||||
dialog.setText("select keyStore");
|
||||
dialog.setFileName("");
|
||||
dialog.setFilterExtensions(new String[] { "*.jks" });// set file extension
|
||||
dialog.setFilterExtensions(new String[] { "*.jks" });// 设置文件扩展名
|
||||
String fileName = dialog.open();//
|
||||
|
||||
if (fileName != null) {
|
||||
@@ -209,7 +205,7 @@ public class SSLDialog extends Dialog {
|
||||
dialog.setFilterPath("");
|
||||
dialog.setText("select trustStore");
|
||||
dialog.setFileName("");
|
||||
dialog.setFilterExtensions(new String[] { "*.jks" });// set file extension
|
||||
dialog.setFilterExtensions(new String[] { "*.jks" });// 设置文件扩展名
|
||||
String fileName = dialog.open();//
|
||||
if (fileName != null) {
|
||||
trustStoreText.setText(fileName);
|
||||
|
||||
@@ -30,7 +30,7 @@ import org.eclipse.swt.graphics.FontData;
|
||||
import org.eclipse.swt.graphics.GC;
|
||||
import org.eclipse.swt.graphics.RGB;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
import org.talend.commons.ui.gmf.util.DisplayUtils;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
|
||||
/**
|
||||
* Figure managing some simple HTML styles. <br/>
|
||||
@@ -267,7 +267,7 @@ public class SimpleHtmlFigure extends Figure {
|
||||
} while (font == null && f != null);
|
||||
|
||||
if (font == null) {
|
||||
GC gc = new GC(DisplayUtils.getDefaultShell(true));
|
||||
GC gc = new GC(new Shell());
|
||||
font = gc.getFont();
|
||||
gc.dispose();
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
Manifest-Version: 1.0
|
||||
Automatic-Module-Name: org.talend.core.repository
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Core Repository Plug-in
|
||||
Bundle-SymbolicName: org.talend.core.repository;singleton:=true
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.repository</artifactId>
|
||||
|
||||
@@ -182,6 +182,7 @@ ProjectRepositoryNode.sapContentExtractor=SAP BI Content Extractor
|
||||
|
||||
RepositoryDropAdapter_copyingItems=Copying items...
|
||||
RepositoryDropAdapter_errorMsg=This directory contains the locked item,it can not be moved now
|
||||
RepositoryDropAdapter_folder=Folder
|
||||
RepositoryDropAdapter_lockedByOthers=This item is locked by other users, it can not be moved now.
|
||||
RepositoryDropAdapter_lockedByYou=This item is locked by you, it can not be moved now.
|
||||
RepositoryDropAdapter_moveTitle=Move
|
||||
|
||||
@@ -6,7 +6,7 @@ import org.apache.log4j.Logger;
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.core.runtime.SubMonitor;
|
||||
import org.eclipse.jface.operation.IRunnableWithProgress;
|
||||
import org.talend.commons.ui.gmf.util.DisplayUtils;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
import org.talend.login.AbstractLoginTask;
|
||||
import org.talend.repository.model.IRepositoryService;
|
||||
@@ -21,7 +21,7 @@ public class ReadOnlyProjectConfirm extends AbstractLoginTask implements IRunnab
|
||||
SubMonitor subMonitor = SubMonitor.convert(monitor, 1);
|
||||
subMonitor.setTaskName("ReadOnly confirm.");
|
||||
IRepositoryService service = (IRepositoryService) GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
|
||||
service.openReadOnlyDialog(DisplayUtils.getDefaultShell(false));
|
||||
service.openReadOnlyDialog(new Shell());
|
||||
|
||||
subMonitor.done();
|
||||
}
|
||||
|
||||
@@ -67,7 +67,6 @@ import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.commons.exception.SystemException;
|
||||
import org.talend.commons.runtime.model.repository.ERepositoryStatus;
|
||||
import org.talend.commons.runtime.service.ITaCoKitService;
|
||||
import org.talend.commons.ui.gmf.util.DisplayUtils;
|
||||
import org.talend.commons.ui.runtime.CommonUIPlugin;
|
||||
import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
|
||||
import org.talend.commons.utils.data.container.RootContainer;
|
||||
@@ -408,7 +407,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
|
||||
public void run() {
|
||||
Shell currentShell = tmpDisplay.getActiveShell();
|
||||
if (currentShell == null) {
|
||||
currentShell = DisplayUtils.getDefaultShell(false);
|
||||
currentShell = new Shell();
|
||||
}
|
||||
MessageBox box = new MessageBox(currentShell, SWT.ICON_WARNING | SWT.OK | SWT.CANCEL);
|
||||
box.setText(Messages.getString("ProxyRepositoryFactory.JobNameErroe")); //$NON-NLS-1$
|
||||
|
||||
@@ -27,9 +27,10 @@ import javax.net.ssl.SSLSocketFactory;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.talend.core.repository.i18n.Messages;
|
||||
|
||||
import javax.net.ssl.KeyManagerFactory;
|
||||
import javax.net.ssl.SSLContext;
|
||||
import javax.net.ssl.TrustManager;
|
||||
import com.sun.net.ssl.KeyManagerFactory;
|
||||
import com.sun.net.ssl.SSLContext;
|
||||
import com.sun.net.ssl.TrustManager;
|
||||
import com.sun.net.ssl.internal.ssl.Provider;
|
||||
|
||||
/**
|
||||
* This class is used for LDAP. <br/>
|
||||
@@ -218,7 +219,7 @@ public class AdvancedSocketFactory extends SSLSocketFactory {
|
||||
*/
|
||||
private void init(KeyStore ks, char password[]) {
|
||||
SSLContext ctx = null;
|
||||
javax.net.ssl.KeyManager keyManagers[] = null;
|
||||
com.sun.net.ssl.KeyManager keyManagers[] = null;
|
||||
TrustManager trustManagers[] = null;
|
||||
try {
|
||||
if (ks != null) {
|
||||
@@ -237,6 +238,6 @@ public class AdvancedSocketFactory extends SSLSocketFactory {
|
||||
}
|
||||
|
||||
static {
|
||||
Security.addProvider(java.security.Security.getProvider("SUN"));
|
||||
Security.addProvider(new Provider());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,15 +24,13 @@ import java.net.URLConnection;
|
||||
import java.security.KeyStore;
|
||||
import java.security.KeyStoreException;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.security.cert.CertificateException;
|
||||
import java.security.cert.X509Certificate;
|
||||
|
||||
import org.apache.log4j.Logger;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.core.repository.i18n.Messages;
|
||||
|
||||
import javax.net.ssl.TrustManagerFactory;
|
||||
import javax.net.ssl.X509TrustManager;
|
||||
import com.sun.net.ssl.TrustManagerFactory;
|
||||
import com.sun.net.ssl.X509TrustManager;
|
||||
|
||||
/**
|
||||
* This class is used for verifying CA for LDAP connection.
|
||||
@@ -76,6 +74,26 @@ public class LDAPCATruster implements X509TrustManager {
|
||||
init();
|
||||
}
|
||||
|
||||
/**
|
||||
* Comment method "deleteCert".
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
private boolean deleteCert(String id) {
|
||||
try {
|
||||
ks.deleteEntry(id);
|
||||
} catch (KeyStoreException ex) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see com.sun.net.ssl.X509TrustManager#getAcceptedIssuers()
|
||||
*/
|
||||
public X509Certificate[] getAcceptedIssuers() {
|
||||
if (trustManager == null)
|
||||
return null;
|
||||
@@ -159,7 +177,7 @@ public class LDAPCATruster implements X509TrustManager {
|
||||
TrustManagerFactory trustManagerFactory = null;
|
||||
trustManagerFactory = TrustManagerFactory.getInstance("SunX509"); //$NON-NLS-1$
|
||||
trustManagerFactory.init(ks);
|
||||
javax.net.ssl.TrustManager trusts[] = trustManagerFactory.getTrustManagers();
|
||||
com.sun.net.ssl.TrustManager trusts[] = trustManagerFactory.getTrustManagers();
|
||||
return (X509TrustManager) trusts[0];
|
||||
}
|
||||
|
||||
@@ -174,24 +192,29 @@ public class LDAPCATruster implements X509TrustManager {
|
||||
return false;
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see com.sun.net.ssl.X509TrustManager#isClientTrusted(java.security.cert.X509Certificate[])
|
||||
*/
|
||||
public boolean isClientTrusted(X509Certificate chain[]) {
|
||||
if (trustManager == null)
|
||||
return false;
|
||||
else
|
||||
return trustManager.isClientTrusted(chain);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see com.sun.net.ssl.X509TrustManager#isServerTrusted(java.security.cert.X509Certificate[])
|
||||
*/
|
||||
public boolean isServerTrusted(X509Certificate chain[], String authType) {
|
||||
boolean isTrusted = false;
|
||||
if (trustManager != null) {
|
||||
try {
|
||||
trustManager.checkServerTrusted(chain, authType);
|
||||
isTrusted = true;
|
||||
}catch (CertificateException e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
}
|
||||
if (isTrusted) {
|
||||
return true;
|
||||
}
|
||||
public boolean isServerTrusted(X509Certificate chain[]) {
|
||||
if (trustManager != null) {
|
||||
boolean rs = trustManager.isServerTrusted(chain);
|
||||
if (rs)
|
||||
return rs;
|
||||
}
|
||||
X509Certificate ca = getCACert(chain);
|
||||
if (ca != null) {
|
||||
if (isAccepted(ca)) {
|
||||
@@ -207,16 +230,7 @@ public class LDAPCATruster implements X509TrustManager {
|
||||
log.error(Messages.getString("LDAPCATruster.failedCreateTmp") + e.getMessage()); //$NON-NLS-1$
|
||||
return false;
|
||||
}
|
||||
boolean isTmpTrusted = false;
|
||||
if (tmpTrustManager != null) {
|
||||
try {
|
||||
tmpTrustManager.checkServerTrusted(chain, authType);
|
||||
isTmpTrusted = true;
|
||||
}catch (CertificateException e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
}
|
||||
if (isTmpTrusted) {
|
||||
if (tmpTrustManager.isServerTrusted(chain)) {
|
||||
if (this.isSaveCA) {
|
||||
saveStore();
|
||||
trustManager = tmpTrustManager;
|
||||
@@ -265,19 +279,4 @@ public class LDAPCATruster implements X509TrustManager {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
|
||||
if (trustManager == null) {
|
||||
throw new CertificateException(Messages.getString("LDAPCATruster.failedInitialTrust"));
|
||||
}
|
||||
trustManager.checkClientTrusted(chain, authType);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
|
||||
if (!isServerTrusted(chain, authType)) {
|
||||
throw new CertificateException(Messages.getString("LDAPCATruster.sslError1"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,7 +48,6 @@ import org.eclipse.ui.actions.ActionFactory;
|
||||
import org.talend.commons.exception.BusinessException;
|
||||
import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.commons.runtime.model.repository.ERepositoryStatus;
|
||||
import org.talend.commons.ui.gmf.util.DisplayUtils;
|
||||
import org.talend.commons.ui.runtime.exception.ExceptionHandler;
|
||||
import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
|
||||
import org.talend.commons.ui.runtime.image.EImage;
|
||||
@@ -1242,8 +1241,7 @@ public class DeleteAction extends AContextualAction {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
MessageDialog dialog = new MessageDialog(DisplayUtils.getDefaultShell(false), title, null, lockMessage,
|
||||
MessageDialog.ERROR,
|
||||
MessageDialog dialog = new MessageDialog(new Shell(), title, null, lockMessage, MessageDialog.ERROR,
|
||||
new String[] { IDialogConstants.OK_LABEL }, 0);
|
||||
dialog.open();
|
||||
}
|
||||
@@ -1374,7 +1372,7 @@ public class DeleteAction extends AContextualAction {
|
||||
+ " " + Messages.getString("DeleteAction.dialog.message0") + "\n" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
+ Messages.getString("DeleteAction.dialog.message2"); //$NON-NLS-1$
|
||||
|
||||
confirmFromDialog = MessageDialog.openQuestion(DisplayUtils.getDefaultShell(false), title, message);
|
||||
confirmFromDialog = MessageDialog.openQuestion(new Shell(), title, message);
|
||||
}
|
||||
});
|
||||
confirm = confirmFromDialog;
|
||||
@@ -1841,7 +1839,7 @@ public class DeleteAction extends AContextualAction {
|
||||
}
|
||||
}
|
||||
if (shell == null) {
|
||||
shell = DisplayUtils.getDefaultShell(false);
|
||||
shell = new Shell();
|
||||
}
|
||||
return shell;
|
||||
}
|
||||
|
||||
@@ -27,9 +27,9 @@ import org.eclipse.jface.viewers.ISelection;
|
||||
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||
import org.eclipse.jface.viewers.TreeViewer;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.commons.runtime.model.repository.ERepositoryStatus;
|
||||
import org.talend.commons.ui.gmf.util.DisplayUtils;
|
||||
import org.talend.commons.ui.runtime.exception.ExceptionHandler;
|
||||
import org.talend.commons.ui.runtime.image.EImage;
|
||||
import org.talend.commons.ui.runtime.image.ImageProvider;
|
||||
@@ -157,8 +157,8 @@ public class DeleteTableAction extends AContextualAction {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
MessageDialog dialog = new MessageDialog(DisplayUtils.getDefaultShell(false), title, null,
|
||||
message, MessageDialog.ERROR, new String[] { IDialogConstants.OK_LABEL }, 0);
|
||||
MessageDialog dialog = new MessageDialog(new Shell(), title, null, message, MessageDialog.ERROR,
|
||||
new String[] { IDialogConstants.OK_LABEL }, 0);
|
||||
dialog.open();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -40,7 +40,6 @@ import org.eclipse.ui.PlatformUI;
|
||||
import org.talend.commons.exception.BusinessException;
|
||||
import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.commons.runtime.model.repository.ERepositoryStatus;
|
||||
import org.talend.commons.ui.gmf.util.DisplayUtils;
|
||||
import org.talend.commons.ui.runtime.exception.ExceptionHandler;
|
||||
import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
|
||||
import org.talend.commons.ui.runtime.image.ECoreImage;
|
||||
@@ -259,7 +258,7 @@ public class EmptyRecycleBinAction extends AContextualAction {
|
||||
}
|
||||
}
|
||||
if (shell == null) {
|
||||
shell = DisplayUtils.getDefaultShell(false);
|
||||
shell = new Shell();
|
||||
}
|
||||
return shell;
|
||||
}
|
||||
|
||||
@@ -18,11 +18,11 @@ import org.eclipse.jface.viewers.IStructuredSelection;
|
||||
import org.eclipse.jface.viewers.StructuredSelection;
|
||||
import org.eclipse.jface.viewers.TreeSelection;
|
||||
import org.eclipse.jface.viewers.TreeViewer;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.eclipse.ui.actions.ActionFactory;
|
||||
import org.talend.commons.exception.BusinessException;
|
||||
import org.talend.commons.exception.CommonExceptionHandler;
|
||||
import org.talend.commons.runtime.model.repository.ERepositoryStatus;
|
||||
import org.talend.commons.ui.gmf.util.DisplayUtils;
|
||||
import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
|
||||
import org.talend.commons.ui.runtime.image.EImage;
|
||||
import org.talend.commons.ui.runtime.image.ImageProvider;
|
||||
@@ -116,9 +116,8 @@ public class PasteAction extends AContextualAction {
|
||||
if (copyObjectAction.validateAction((RepositoryNode) currentSource, target)) {
|
||||
copyObjectAction.execute((RepositoryNode) currentSource, target);
|
||||
} else {
|
||||
MessageDialog.openWarning(DisplayUtils.getDefaultShell(false),
|
||||
Messages.getString("PasteObjectAction.error.title"), Messages //$NON-NLS-1$
|
||||
.getString("PasteObjectAction.error.labelAlreadyExists")); //$NON-NLS-1$
|
||||
MessageDialog.openWarning(new Shell(), Messages.getString("PasteObjectAction.error.title"), Messages //$NON-NLS-1$
|
||||
.getString("PasteObjectAction.error.labelAlreadyExists")); //$NON-NLS-1$
|
||||
}
|
||||
} catch (BusinessException e) {
|
||||
MessageBoxExceptionHandler.process(e);
|
||||
|
||||
@@ -121,7 +121,8 @@ public class RepositoryDropAdapter extends PluginDropAdapter {
|
||||
boolean isLock = MoveObjectAction.getInstance().isLock(sourceNode);
|
||||
if (isLock) {
|
||||
String errorMsg = null;
|
||||
if (sourceNode.getObjectType().getType().equals(ERepositoryObjectType.FOLDER.getType())) {
|
||||
if (sourceNode.getObjectType().getType()
|
||||
.equalsIgnoreCase(Messages.getString("RepositoryDropAdapter_folder"))) { //$NON-NLS-1$
|
||||
errorMsg = Messages.getString("RepositoryDropAdapter_errorMsg"); //$NON-NLS-1$
|
||||
}
|
||||
if (ProxyRepositoryFactory.getInstance().getStatus(repositoryObject) == ERepositoryStatus.LOCK_BY_USER) {
|
||||
@@ -652,7 +653,7 @@ public class RepositoryDropAdapter extends PluginDropAdapter {
|
||||
IRepositoryViewObject objectToCopy = repositoryNode.getObject();
|
||||
// TDI-14680 add a warning message when move a directory that it has locked jobs.
|
||||
IRepositoryNode node = objectToCopy.getRepositoryNode();
|
||||
if (node.getObjectType().getType().equals(ERepositoryObjectType.FOLDER.getType())) {
|
||||
if (node.getObjectType().getType().equalsIgnoreCase(Messages.getString("RepositoryDropAdapter_folder"))) { //$NON-NLS-1$
|
||||
errorMsg = Messages.getString("RepositoryDropAdapter_errorMsg"); //$NON-NLS-1$
|
||||
}
|
||||
if (ProxyRepositoryFactory.getInstance().getStatus(objectToCopy) == ERepositoryStatus.LOCK_BY_USER) {
|
||||
|
||||
@@ -1,280 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<mapping>
|
||||
<dbms product="AMAZON_AURORA" id="amazon_aurora_id" label="Mapping AMAZON_AURORA"
|
||||
default="true">
|
||||
<dbTypes>
|
||||
<dbType type="BIGINT" ignorePre="true"/>
|
||||
<dbType type="BIGINT UNSIGNED" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="BINARY" ignorePre="true"/>
|
||||
<dbType type="BIT" ignorePre="true" />
|
||||
<dbType type="BLOB" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="CHAR" defaultLength="200" ignorePre="true"/>
|
||||
<dbType type="DATE" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="DATETIME" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" preBeforelen="false"/>
|
||||
<dbType type="DOUBLE" defaultLength="20" defaultPrecision="10"/>
|
||||
<dbType type="DOUBLE UNSIGNED" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="ENUM" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="FLOAT" defaultPrecision="2"/>
|
||||
<dbType type="FLOAT UNSIGNED" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="GEOMETRY" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="GEOMETRYCOLLECTION" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="INT" ignorePre="true" />
|
||||
<dbType type="INT UNSIGNED" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="LINESTRING" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="LONGTEXT" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="LONGBLOB" ignoreLen="true" ignorePre="true"/>
|
||||
<dbType type="MEDIUMBLOB" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="MEDIUMINT" ignorePre="true" />
|
||||
<dbType type="MEDIUMINT UNSIGNED" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="MEDIUMTEXT" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="MULTILINESTRING" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="MULTIPOINT" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="MULTIPOLYGON" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="POINT" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="POLYGON" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="SMALLINT" ignorePre="true" />
|
||||
<dbType type="SMALLINT UNSIGNED" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="SET" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="TIME" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="TINYBLOB" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="TINYINT" ignorePre="true" />
|
||||
<dbType type="TINYINT UNSIGNED" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="TINYTEXT" ignoreLen="true" ignorePre="true" />
|
||||
<dbType type="VARBINARY" ignorePre="true" />
|
||||
<dbType type="VARCHAR" default="true" defaultLength="100" ignorePre="true"/>
|
||||
<dbType type="YEAR" ignorePre="true"/>
|
||||
</dbTypes>
|
||||
|
||||
<language name="java">
|
||||
<talendToDbTypes><!-- Adviced mappings -->
|
||||
<talendType type="id_List"/>
|
||||
<talendType type="id_Boolean">
|
||||
<dbType type="BIT" default="true" />
|
||||
</talendType>
|
||||
<talendType type="id_Byte">
|
||||
<dbType type="TINYINT" default="true" />
|
||||
<dbType type="BIGINT" />
|
||||
<dbType type="INT" />
|
||||
<dbType type="MEDIUMINT" />
|
||||
<dbType type="SMALLINT" />
|
||||
</talendType>
|
||||
<talendType type="id_byte[]">
|
||||
</talendType>
|
||||
<talendType type="id_Character">
|
||||
<dbType type="CHAR" default="true" />
|
||||
<dbType type="VARCHAR"/>
|
||||
</talendType>
|
||||
<talendType type="id_Date">
|
||||
<dbType type="DATE" />
|
||||
<dbType type="DATETIME" default="true" />
|
||||
<dbType type="TIME" />
|
||||
<dbType type="YEAR" />
|
||||
<dbType type="TIMESTAMP" />
|
||||
</talendType>
|
||||
<talendType type="id_BigDecimal">
|
||||
<dbType type="DECIMAL" default="true" />
|
||||
<dbType type="FLOAT"/>
|
||||
<dbType type="DOUBLE" />
|
||||
</talendType>
|
||||
<talendType type="id_Double">
|
||||
<dbType type="DOUBLE" default="true" />
|
||||
<dbType type="FLOAT"/>
|
||||
<dbType type="DECIMAL" />
|
||||
</talendType>
|
||||
<talendType type="id_Float">
|
||||
<dbType type="FLOAT" default="true" />
|
||||
<dbType type="DOUBLE"/>
|
||||
<dbType type="DECIMAL" />
|
||||
</talendType>
|
||||
<talendType type="id_Integer">
|
||||
<dbType type="INT" default="true" />
|
||||
<dbType type="BIGINT" />
|
||||
</talendType>
|
||||
<talendType type="id_Long">
|
||||
<dbType type="BIGINT" default="true" />
|
||||
</talendType>
|
||||
<talendType type="id_Object">
|
||||
<dbType type="BLOB" default="true"/>
|
||||
<dbType type="ENUM" />
|
||||
<dbType type="GEOMETRY" />
|
||||
<dbType type="GEOMETRYCOLLECTION" />
|
||||
<dbType type="MEDIUMINT" />
|
||||
<dbType type="LONGBLOB" />
|
||||
<dbType type="MEDIUMBLOB" />
|
||||
<dbType type="MULTIPOINT" />
|
||||
<dbType type="MULTIPOLYGON" />
|
||||
<dbType type="POINT" />
|
||||
<dbType type="POLYGON" />
|
||||
<dbType type="SET" />
|
||||
<dbType type="TINYBLOB" />
|
||||
</talendType>
|
||||
<talendType type="id_Short">
|
||||
<dbType type="SMALLINT" default="true" />
|
||||
<dbType type="INT" />
|
||||
<dbType type="BIGINT"/>
|
||||
<dbType type="MEDIUMINT" />
|
||||
</talendType>
|
||||
<talendType type="id_String">
|
||||
<dbType type="VARCHAR" default="true" />
|
||||
<dbType type="LINESTRING" />
|
||||
<dbType type="LONGTEXT"/>
|
||||
<dbType type="MEDIUMTEXT" />
|
||||
<dbType type="MULTILINESTRING" />
|
||||
<dbType type="TEXT" />
|
||||
<dbType type="TINYTEXT" />
|
||||
</talendType>
|
||||
</talendToDbTypes>
|
||||
<dbToTalendTypes>
|
||||
<dbType type="BIGINT">
|
||||
<talendType type="id_Long" default="true" />
|
||||
</dbType>
|
||||
<dbType type="BINARY">
|
||||
<talendType type="id_Boolean" default="true" />
|
||||
</dbType>
|
||||
<dbType type="BIT">
|
||||
<talendType type="id_Boolean" default="true" />
|
||||
</dbType>
|
||||
<dbType type="BLOB">
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="CHAR">
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<dbType type="DATE">
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<dbType type="DATETIME">
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<dbType type="DECIMAL">
|
||||
<talendType type="id_Float"/>
|
||||
<talendType type="id_Double"/>
|
||||
<talendType type="id_BigDecimal" default="true"/>
|
||||
</dbType>
|
||||
<dbType type="DOUBLE">
|
||||
<talendType type="id_Double" default="true" />
|
||||
<talendType type="id_BigDecimal"/>
|
||||
</dbType>
|
||||
<dbType type="ENUM">
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="FLOAT">
|
||||
<talendType type="id_Float" default="true" />
|
||||
<talendType type="id_Double"/>
|
||||
<talendType type="id_BigDecimal"/>
|
||||
</dbType>
|
||||
<dbType type="GEOMETRY">
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="GEOMETRYCOLLECTION">
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="INT">
|
||||
<talendType type="id_Integer" default="true" />
|
||||
<talendType type="id_Long"/>
|
||||
</dbType>
|
||||
<dbType type="LINESTRING">
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<dbType type="LONGTEXT">
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<dbType type="LONGBLOB">
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="MEDIUMBLOB">
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="MEDIUMINT">
|
||||
<talendType type="id_Integer" default="true" />
|
||||
<talendType type="id_Long"/>
|
||||
</dbType>
|
||||
<dbType type="MEDIUMTEXT">
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<dbType type="MULTILINESTRING">
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<dbType type="MULTIPOINT">
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="MULTIPOLYGON">
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="POINT">
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="POLYGON">
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="SMALLINT">
|
||||
<talendType type="id_Short" default="true" />
|
||||
<talendType type="id_Long"/>
|
||||
<talendType type="id_Integer"/>
|
||||
</dbType>
|
||||
<dbType type="SET">
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="TEXT">
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<dbType type="TIME">
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<dbType type="TIMESTAMP">
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<dbType type="TINYBLOB">
|
||||
<talendType type="id_Object" default="true" />
|
||||
</dbType>
|
||||
<dbType type="TINYINT">
|
||||
<talendType type="id_Byte" default="true" />
|
||||
<talendType type="id_Integer"/>
|
||||
<talendType type="id_Long"/>
|
||||
<talendType type="id_Short"/>
|
||||
</dbType>
|
||||
<dbType type="TINYTEXT">
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<dbType type="VARBINARY">
|
||||
</dbType>
|
||||
<dbType type="VARCHAR">
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<dbType type="YEAR">
|
||||
<talendType type="id_Date" default="true" />
|
||||
</dbType>
|
||||
<dbType type="BIGINT UNSIGNED" >
|
||||
</dbType>
|
||||
<dbType type="DOUBLE UNSIGNED" >
|
||||
<talendType type="id_Double" default="true" />
|
||||
<talendType type="id_BigDecimal"/>
|
||||
</dbType>
|
||||
<dbType type="FLOAT UNSIGNED" >
|
||||
<talendType type="id_Double" default="true" />
|
||||
<talendType type="id_BigDecimal"/>
|
||||
</dbType>
|
||||
<dbType type="INT UNSIGNED" >
|
||||
<talendType type="id_Long" default="true" />
|
||||
</dbType>
|
||||
<dbType type="MEDIUMINT UNSIGNED" >
|
||||
<talendType type="id_Integer" default="true" />
|
||||
<talendType type="id_Long" />
|
||||
</dbType>
|
||||
<dbType type="SMALLINT UNSIGNED" >
|
||||
<talendType type="id_Integer" default="true" />
|
||||
<talendType type="id_Long" />
|
||||
</dbType>
|
||||
<dbType type="TINYINT UNSIGNED" >
|
||||
<talendType type="id_Short" default="true" />
|
||||
<talendType type="id_Integer" />
|
||||
<talendType type="id_Long" />
|
||||
</dbType>
|
||||
</dbToTalendTypes>
|
||||
</language>
|
||||
</dbms>
|
||||
|
||||
</mapping>
|
||||
@@ -88,8 +88,10 @@
|
||||
<talendType type="id_BigDecimal" default="true"/>
|
||||
</dbType>
|
||||
<dbType type="BIGINT">
|
||||
<talendType type="id_Long" default="true"/>
|
||||
<talendType type="id_BigDecimal" default="true"/>
|
||||
<talendType type="id_Byte"/>
|
||||
<talendType type="id_Integer"/>
|
||||
<talendType type="id_Long"/>
|
||||
</dbType>
|
||||
<dbType type="INT">
|
||||
<talendType type="id_Integer" default="true"/>
|
||||
|
||||
@@ -32,8 +32,7 @@
|
||||
<dbType type="BOOLEAN" default="true"/>
|
||||
</talendType>
|
||||
<talendType type="id_Byte">
|
||||
<dbType type="BIGINT" default="true" />
|
||||
<dbType type="INTEGER"/>
|
||||
<dbType type="INTEGER" default="true" />
|
||||
</talendType>
|
||||
<talendType type="id_byte[]">
|
||||
<dbType type="BINARY" default="true"/>
|
||||
@@ -56,8 +55,7 @@
|
||||
<dbType type="FLOAT8"/>
|
||||
</talendType>
|
||||
<talendType type="id_Integer">
|
||||
<dbType type="BIGINT" default="true" />
|
||||
<dbType type="INTEGER"/>
|
||||
<dbType type="INTEGER" default="true" />
|
||||
<dbType type="INT8" />
|
||||
</talendType>
|
||||
<talendType type="id_Long">
|
||||
@@ -66,8 +64,7 @@
|
||||
<talendType type="id_Object">
|
||||
</talendType>
|
||||
<talendType type="id_Short">
|
||||
<dbType type="BIGINT" default="true" />
|
||||
<dbType type="INTEGER" />
|
||||
<dbType type="INTEGER" default="true" />
|
||||
</talendType>
|
||||
<talendType type="id_String">
|
||||
<dbType type="VARCHAR" default="true" />
|
||||
@@ -91,14 +88,12 @@
|
||||
<talendType type="id_String" default="true" />
|
||||
</dbType>
|
||||
<dbType type="INTEGER">
|
||||
<talendType type="id_Long" default="true" />
|
||||
<talendType type="id_Integer" />
|
||||
<talendType type="id_Integer" default="true" />
|
||||
<talendType type="id_Short" />
|
||||
<talendType type="id_Byte" />
|
||||
</dbType>
|
||||
<dbType type="INT8">
|
||||
<talendType type="id_Long" default="true" />
|
||||
<talendType type="id_Integer" />
|
||||
<talendType type="id_Integer" default="true" />
|
||||
<talendType type="id_Short" />
|
||||
<talendType type="id_Byte" />
|
||||
</dbType>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.runtime</artifactId>
|
||||
|
||||
@@ -139,7 +139,7 @@ public class GlobalServiceRegister {
|
||||
* @param klass the Service type you want to get
|
||||
* @return IService IService
|
||||
*/
|
||||
public <T extends IService> T getService(Class<T> klass) {
|
||||
public IService getService(Class klass) {
|
||||
IService service = services.get(klass);
|
||||
if (service == null && getConfigurationElements() != null) {
|
||||
service = findService(klass);
|
||||
@@ -149,7 +149,7 @@ public class GlobalServiceRegister {
|
||||
}
|
||||
services.put(klass, service);
|
||||
}
|
||||
return (T) service;
|
||||
return service;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -158,7 +158,7 @@ public class GlobalServiceRegister {
|
||||
* @param klass the interface type want to find.
|
||||
* @return IService
|
||||
*/
|
||||
private <T extends IService> T findService(Class<T> klass) {
|
||||
private IService findService(Class klass) {
|
||||
String key = klass.getName();
|
||||
IConfigurationElement[] configElements = getConfigurationElements();
|
||||
if (configElements != null) {
|
||||
@@ -171,7 +171,7 @@ public class GlobalServiceRegister {
|
||||
try {
|
||||
Object service = element.createExecutableExtension("class"); //$NON-NLS-1$
|
||||
if (klass.isInstance(service)) {
|
||||
return (T) service;
|
||||
return (IService) service;
|
||||
}
|
||||
} catch (CoreException e) {
|
||||
ExceptionHandler.process(e);
|
||||
|
||||
@@ -16,7 +16,7 @@ import org.talend.core.model.metadata.IMetadataConnection;
|
||||
import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
|
||||
import org.talend.core.model.metadata.builder.connection.FileConnection;
|
||||
|
||||
public interface IRepositoryContextService extends IService {
|
||||
public interface IRepositoryContextService {
|
||||
|
||||
public DatabaseConnection cloneOriginalValueConnection(DatabaseConnection dbConn);
|
||||
|
||||
|
||||
@@ -18,6 +18,7 @@ import java.net.URL;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.eclipse.core.runtime.FileLocator;
|
||||
import org.eclipse.core.runtime.Platform;
|
||||
import org.eclipse.core.runtime.Plugin;
|
||||
import org.osgi.framework.Bundle;
|
||||
|
||||
/**
|
||||
@@ -144,6 +145,10 @@ public class PluginChecker {
|
||||
return isJobLetPluginLoaded();
|
||||
}
|
||||
|
||||
public static Plugin getWSDLPlugin() {
|
||||
return Platform.getPlugin(WSDL_PLUGIN_ID);
|
||||
}
|
||||
|
||||
public static boolean isRefProjectLoaded() {
|
||||
return isPluginLoaded(REF_PROJECT_PLUGIN_ID);
|
||||
}
|
||||
|
||||
@@ -44,8 +44,6 @@ public class RepositoryContext {
|
||||
|
||||
private Map<String, String> fields;
|
||||
|
||||
private boolean token = false;
|
||||
|
||||
/**
|
||||
* DOC smallet RepositoryContext constructor comment.
|
||||
*
|
||||
@@ -248,12 +246,4 @@ public class RepositoryContext {
|
||||
public void setNoUpdateWhenLogon(boolean noUpdateWhenLogon) {
|
||||
this.noUpdateWhenLogon = noUpdateWhenLogon;
|
||||
}
|
||||
|
||||
public boolean isToken() {
|
||||
return this.token;
|
||||
}
|
||||
|
||||
public void setToken(boolean token) {
|
||||
this.token = token;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,105 +22,98 @@ import org.talend.core.runtime.projectsetting.IProjectSettingPreferenceConstants
|
||||
*/
|
||||
public enum EDatabaseTypeName {
|
||||
MYSQL(
|
||||
"MySQL", "MySQL", Boolean.FALSE, "MYSQL", "MYSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
"MySQL", "MySQL", Boolean.FALSE, "MYSQL", "MYSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
AMAZON_AURORA(
|
||||
"Amazon Aurora", "Amazon Aurora", Boolean.FALSE, "AMAZON_AURORA", "AMAZON_AURORA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
"Amazon Aurora", "Amazon Aurora", Boolean.FALSE, "AMAZON_AURORA", "AMAZON_AURORA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
PSQL(
|
||||
"PostgreSQL", "PostgreSQL", Boolean.TRUE, "POSTGRESQL", "POSTGRE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
"PostgreSQL", "PostgreSQL", Boolean.TRUE, "POSTGRESQL", "POSTGRE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
PLUSPSQL(
|
||||
"PostgresPlus", "PostgresPlus", Boolean.TRUE, "POSTGRESPLUS", "POSTGREPLUS", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
"PostgresPlus", "PostgresPlus", Boolean.TRUE, "POSTGRESPLUS", "POSTGREPLUS", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
ORACLEFORSID(
|
||||
"ORACLE_SID", "Oracle with SID", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
"ORACLE_SID", "Oracle with SID", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
ORACLESN(
|
||||
"ORACLE_SERVICE_NAME", "Oracle with service name", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
"ORACLE_SERVICE_NAME", "Oracle with service name", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
ORACLE_OCI(
|
||||
"ORACLE_OCI", "Oracle OCI", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
"ORACLE_OCI", "Oracle OCI", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
ORACLE_CUSTOM(
|
||||
"ORACLE_CUSTOM", "Oracle Custom", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
"ORACLE_CUSTOM", "Oracle Custom", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
/**
|
||||
* @deprecated odbc is not supported in java8
|
||||
*/
|
||||
GODBC(
|
||||
"Generic ODBC", "Generic ODBC (Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"Generic ODBC", "Generic ODBC (Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
/**
|
||||
* @deprecated odbc is not supported in java8
|
||||
*/
|
||||
MSODBC(
|
||||
"Microsoft SQL (Odbc driver)", "Microsoft SQL Server (Odbc driver, Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"Microsoft SQL (Odbc driver)", "Microsoft SQL Server (Odbc driver, Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
IBMDB2(
|
||||
"IBM DB2", "IBM DB2", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
"IBM DB2", "IBM DB2", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
IBMDB2ZOS(
|
||||
"IBM DB2 ZOS", "IBM DB2 ZOS", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
"IBM DB2 ZOS", "IBM DB2 ZOS", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
SYBASEASE(
|
||||
"SybaseASE", "Sybase (ASE and IQ)", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"SybaseASE", "Sybase (ASE and IQ)", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
// this Sybase IQ not used.
|
||||
SYBASEIQ(
|
||||
"Sybase IQ", "Sybase IQ", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"Sybase IQ", "Sybase IQ", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
MSSQL(
|
||||
"MSSQL", "Microsoft SQL Server", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
"MSSQL", "Microsoft SQL Server", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
MSSQL05_08(
|
||||
"MSSQL", "Microsoft SQL Server 2005/2008", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
"MSSQL", "Microsoft SQL Server 2005/2008", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
// this don't use in Branch 2.0
|
||||
HSQLDB(
|
||||
"HSQLDB", "HSQLDB", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
HSQLDB("HSQLDB", "HSQLDB", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
HSQLDB_SERVER(
|
||||
"HSQLDB Server", "HSQLDB Server", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"HSQLDB Server", "HSQLDB Server", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
HSQLDB_WEBSERVER(
|
||||
"HSQLDB WebServer", "HSQLDB WebServer", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"HSQLDB WebServer", "HSQLDB WebServer", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
HSQLDB_IN_PROGRESS(
|
||||
"HSQLDB In-Process", "HSQLDB In-Process", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"HSQLDB In-Process", "HSQLDB In-Process", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
JAVADB(
|
||||
"JavaDB", "JavaDB", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
JAVADB("JavaDB", "JavaDB", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
INGRES(
|
||||
"Ingres", "Ingres", Boolean.FALSE, "INGRES", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "INGRES"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"Ingres", "Ingres", Boolean.FALSE, "INGRES", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "INGRES"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
INTERBASE(
|
||||
"Interbase", "Interbase", Boolean.FALSE, "INTERBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INTERBASE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
SQLITE(
|
||||
"SQLite", "SQLite", Boolean.FALSE, "SQLITE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "SQLITE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"Interbase", "Interbase", Boolean.FALSE, "INTERBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INTERBASE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
SQLITE("SQLite", "SQLite", Boolean.FALSE, "SQLITE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "SQLITE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
FIREBIRD(
|
||||
"FireBird", "FireBird", Boolean.FALSE, "FIREBIRD", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "FIREBIRD"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"FireBird", "FireBird", Boolean.FALSE, "FIREBIRD", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "FIREBIRD"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
INFORMIX(
|
||||
"Informix", "Informix", Boolean.TRUE, "INFORMIX", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INFORMIX"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"Informix", "Informix", Boolean.TRUE, "INFORMIX", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INFORMIX"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
VECTORWISE(
|
||||
"VectorWise", "VectorWise", Boolean.FALSE, "VECTORWISE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"VectorWise", "VectorWise", Boolean.FALSE, "VECTORWISE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
ACCESS(
|
||||
"Access", "Access", Boolean.FALSE, "ACCESS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Default_Name), // "ACCESS"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"Access", "Access", Boolean.FALSE, "ACCESS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Default_Name), // "ACCESS"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
TERADATA(
|
||||
"Teradata", "Teradata", Boolean.TRUE, "TERADATA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "TERADATA"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
AS400(
|
||||
"AS400", "AS400", Boolean.FALSE, "AS400", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Login), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"Teradata", "Teradata", Boolean.TRUE, "TERADATA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "TERADATA"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
AS400("AS400", "AS400", Boolean.FALSE, "AS400", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Login), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
JAVADB_EMBEDED(
|
||||
"JavaDB Embeded", "JavaDB Embeded", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"JavaDB Embeded", "JavaDB Embeded", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
JAVADB_JCCJDBC(
|
||||
"JavaDB JCCJDBC", "JavaDB JCCJDBC", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"JavaDB JCCJDBC", "JavaDB JCCJDBC", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
JAVADB_DERBYCLIENT(
|
||||
"JavaDB DerbyClient", "JavaDB DerbyClient", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"JavaDB DerbyClient", "JavaDB DerbyClient", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
VERTICA(
|
||||
"Vertica", "Vertica", Boolean.TRUE, "VERTICA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
MAXDB(
|
||||
"MAXDB", "MaxDB", Boolean.FALSE, "MAXDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
MAXDB("MAXDB", "MaxDB", Boolean.FALSE, "MAXDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
GREENPLUM(
|
||||
"Greenplum", "Greenplum", Boolean.TRUE, "GREENPLUM", "GREENPLUM", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
"Greenplum", "Greenplum", Boolean.TRUE, "GREENPLUM", "GREENPLUM", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
PARACCEL(
|
||||
"ParAccel", "ParAccel", Boolean.TRUE, "PARACCEL", "PARACCEL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
"ParAccel", "ParAccel", Boolean.TRUE, "PARACCEL", "PARACCEL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
NETEZZA(
|
||||
"Netezza", "Netezza", Boolean.FALSE, "NETEZZA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
SAS("SAS", "SAS", Boolean.TRUE, "SAS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
// General JDBC not support schema defalut
|
||||
GENERAL_JDBC(
|
||||
"General JDBC", "General JDBC", Boolean.FALSE, "JDBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
EXASOL(
|
||||
"Exasol", "Exasol", Boolean.TRUE, "Exasol", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"General JDBC", "General JDBC", Boolean.FALSE, "JDBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
EXASOL("Exasol", "Exasol", Boolean.TRUE, "Exasol", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
HIVE(
|
||||
"Hive", "Hive", Boolean.FALSE, "HIVE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
HIVE("Hive", "Hive", Boolean.FALSE, "HIVE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
SAPHana(
|
||||
"SAPHana", "SAPHana", Boolean.TRUE, "SAPHANA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
@@ -128,23 +121,24 @@ public enum EDatabaseTypeName {
|
||||
H2("H2", "H2", Boolean.FALSE, "H2", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
REDSHIFT(
|
||||
"Redshift", "Redshift", Boolean.TRUE, "REDSHIFT", "REDSHIFT", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
REDSHIFT_SSO("Redshift SSO", //$NON-NLS-1$
|
||||
"Redshift SSO", //$NON-NLS-1$
|
||||
Boolean.TRUE,
|
||||
"REDSHIFT", //$NON-NLS-1$
|
||||
"REDSHIFT SSO", //$NON-NLS-1$
|
||||
EDatabaseSchemaOrCatalogMapping.Sid,
|
||||
EDatabaseSchemaOrCatalogMapping.Schema),
|
||||
"Redshift", "Redshift", Boolean.TRUE, "REDSHIFT", "REDSHIFT", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
REDSHIFT_SSO(
|
||||
"Redshift SSO", //$NON-NLS-1$
|
||||
"Redshift SSO", //$NON-NLS-1$
|
||||
Boolean.TRUE,
|
||||
"REDSHIFT", //$NON-NLS-1$
|
||||
"REDSHIFT SSO", //$NON-NLS-1$
|
||||
EDatabaseSchemaOrCatalogMapping.Sid,
|
||||
EDatabaseSchemaOrCatalogMapping.Schema),
|
||||
|
||||
IMPALA(
|
||||
"IMPALA", "Impala", Boolean.TRUE, "IMPALA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"IMPALA", "Impala", Boolean.TRUE, "IMPALA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
HBASE(
|
||||
"HBase", "HBase", Boolean.FALSE, "HBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"HBase", "HBase", Boolean.FALSE, "HBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
MAPRDB(
|
||||
"MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
"MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
// displayName is used in Java code.
|
||||
private String displayName;
|
||||
@@ -328,24 +322,11 @@ public enum EDatabaseTypeName {
|
||||
boolean isSupport = true;
|
||||
|
||||
if (EDatabaseTypeName.GODBC == this || EDatabaseTypeName.MSODBC == this) {
|
||||
boolean isSupportODBC =
|
||||
CoreRuntimePlugin
|
||||
.getInstance()
|
||||
.getProjectPreferenceManager()
|
||||
.getBoolean(IProjectSettingPreferenceConstants.METADATA_DBCONNECTION_ODBC_ENABLE);
|
||||
boolean isSupportODBC = CoreRuntimePlugin.getInstance().getProjectPreferenceManager()
|
||||
.getBoolean(IProjectSettingPreferenceConstants.METADATA_DBCONNECTION_ODBC_ENABLE);
|
||||
isSupport = isSupportODBC;
|
||||
}
|
||||
|
||||
return isSupport;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for dbType.
|
||||
*
|
||||
* @return the dbType
|
||||
*/
|
||||
public String getDbType() {
|
||||
return this.dbType;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -93,30 +93,30 @@ public enum EDatabaseConnTemplate {
|
||||
"jdbc:sybase:Tds:<host>:<port>/<sid>?<property>", //$NON-NLS-1$
|
||||
"5001")), //$NON-NLS-1$
|
||||
SYBASEASE_16_SA(new DbConnStr(EDatabaseTypeName.SYBASEASE, //
|
||||
"jdbc:sqlanywhere:Host=<host>:<port>;DatabaseName=<sid>;<property>", //$NON-NLS-1$
|
||||
"jdbc:sqlanywhere:Host=<host>:<port>;DatabaseName=<sid>", //$NON-NLS-1$
|
||||
"2638")), //$NON-NLS-1$
|
||||
IBMDB2(new DbConnStr(EDatabaseTypeName.IBMDB2, //
|
||||
"jdbc:db2://<host>:<port>/<sid>:<property>", //$NON-NLS-1$
|
||||
"jdbc:db2://<host>:<port>/<sid>", //$NON-NLS-1$
|
||||
"50000")), //$NON-NLS-1$
|
||||
|
||||
IBMDB2_ZOS(new DbConnStr(EDatabaseTypeName.IBMDB2ZOS, //
|
||||
"jdbc:db2://<host>:<port>/<sid>:<property>", //$NON-NLS-1$
|
||||
"jdbc:db2://<host>:<port>/<sid>", //$NON-NLS-1$
|
||||
"557")), //$NON-NLS-1$
|
||||
|
||||
SQLITE(new DbConnStr(EDatabaseTypeName.SQLITE, //
|
||||
"jdbc:sqlite:/<filename>")), //$NON-NLS-1$
|
||||
|
||||
INGRES(new DbConnStr(EDatabaseTypeName.INGRES, //
|
||||
"jdbc:ingres://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
|
||||
"jdbc:ingres://<host>:<port>/<sid>", //$NON-NLS-1$
|
||||
"II7")), //$NON-NLS-1$
|
||||
VECTORWISE(new DbConnStr(EDatabaseTypeName.VECTORWISE, //
|
||||
"jdbc:ingres://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
|
||||
"jdbc:ingres://<host>:<port>/<sid>", //$NON-NLS-1$
|
||||
"II7")), //$NON-NLS-1$
|
||||
INTERBASE(new DbConnStr(EDatabaseTypeName.INTERBASE, //
|
||||
"jdbc:interbase://<host>/<sid>?<property>")), //$NON-NLS-1$
|
||||
"jdbc:interbase://<host>/<sid>")), //$NON-NLS-1$
|
||||
|
||||
FIREBIRD(new DbConnStr(EDatabaseTypeName.FIREBIRD, //
|
||||
"jdbc:firebirdsql:<host>/<port>:<filename>?<property>", //$NON-NLS-1$
|
||||
"jdbc:firebirdsql:<host>/<port>:<filename>", //$NON-NLS-1$
|
||||
"3050")), //$NON-NLS-1$
|
||||
|
||||
INFORMIX(new DbConnStr(EDatabaseTypeName.INFORMIX, //
|
||||
@@ -134,22 +134,22 @@ public enum EDatabaseConnTemplate {
|
||||
"prompt=false")), //$NON-NLS-1$
|
||||
|
||||
JAVADB_EMBEDED(new DbConnStr(EDatabaseTypeName.JAVADB_EMBEDED, //
|
||||
"jdbc:derby:<dbRootPath>;<property>")), //$NON-NLS-1$
|
||||
"jdbc:derby:<dbRootPath>")), //$NON-NLS-1$
|
||||
|
||||
JAVADB_JCCJDBC(new DbConnStr(EDatabaseTypeName.JAVADB_JCCJDBC, //
|
||||
"jdbc:derby:net://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
|
||||
"jdbc:derby:net://<host>:<port>/<sid>", //$NON-NLS-1$
|
||||
"1527")), //$NON-NLS-1$
|
||||
|
||||
JAVADB_DERBYCLIENT(new DbConnStr(EDatabaseTypeName.JAVADB_DERBYCLIENT, //
|
||||
"jdbc:derby://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
|
||||
"jdbc:derby://<host>:<port>/<sid>", //$NON-NLS-1$
|
||||
"1527")), //$NON-NLS-1$
|
||||
|
||||
HSQLDB_SERVER(new DbConnStr(EDatabaseTypeName.HSQLDB_SERVER, //
|
||||
"jdbc:hsqldb:hsql://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
|
||||
"jdbc:hsqldb:hsql://<host>:<port>/<sid>", //$NON-NLS-1$
|
||||
"9001")), //$NON-NLS-1$
|
||||
|
||||
HSQLDB_WEBSERVER(new DbConnStr(EDatabaseTypeName.HSQLDB_WEBSERVER, //
|
||||
"jdbc:hsqldb:http://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
|
||||
"jdbc:hsqldb:http://<host>:<port>/<sid>", //$NON-NLS-1$
|
||||
"9001")), //$NON-NLS-1$
|
||||
|
||||
HSQLDB_IN_PROGRESS(new DbConnStr(EDatabaseTypeName.HSQLDB_IN_PROGRESS, //
|
||||
@@ -157,7 +157,7 @@ public enum EDatabaseConnTemplate {
|
||||
null, "ifexists=true")), //$NON-NLS-1$
|
||||
|
||||
MAXDB(new DbConnStr(EDatabaseTypeName.MAXDB, //
|
||||
"jdbc:sapdb://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
|
||||
"jdbc:sapdb://<host>:<port>/<sid>", //$NON-NLS-1$
|
||||
"7210")), //$NON-NLS-1$
|
||||
|
||||
SAS(new DbConnStr(EDatabaseTypeName.SAS, //
|
||||
@@ -170,11 +170,11 @@ public enum EDatabaseConnTemplate {
|
||||
"")), //$NON-NLS-1$
|
||||
|
||||
PARACCEL(new DbConnStr(EDatabaseTypeName.PARACCEL, //
|
||||
"jdbc:paraccel://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
|
||||
"jdbc:paraccel://<host>:<port>/<sid>", //$NON-NLS-1$
|
||||
"5439")), //$NON-NLS-1$
|
||||
|
||||
REDSHIFT(new DbConnStr(EDatabaseTypeName.REDSHIFT, //
|
||||
"jdbc:redshift://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
|
||||
"jdbc:redshift://<host>:<port>/<sid>", //$NON-NLS-1$
|
||||
"5439",//$NON-NLS-1$
|
||||
"")), //$NON-NLS-1$
|
||||
REDSHIFT_SSO(new DbConnStr(EDatabaseTypeName.REDSHIFT_SSO, //
|
||||
@@ -182,7 +182,7 @@ public enum EDatabaseConnTemplate {
|
||||
"5439",//$NON-NLS-1$
|
||||
"")), //$NON-NLS-1$
|
||||
NETEZZA(new DbConnStr(EDatabaseTypeName.NETEZZA, //
|
||||
"jdbc:netezza://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
|
||||
"jdbc:netezza://<host>:<port>/<sid>", //$NON-NLS-1$
|
||||
"5480")), //$NON-NLS-1$
|
||||
|
||||
VERTICA(new DbConnStr(EDatabaseTypeName.VERTICA, //
|
||||
@@ -306,7 +306,7 @@ public enum EDatabaseConnTemplate {
|
||||
List<ERepositoryObjectType> extraTypes = new ArrayList<ERepositoryObjectType>();
|
||||
IGenericDBService dbService = null;
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericDBService.class)) {
|
||||
dbService = GlobalServiceRegister.getDefault().getService(
|
||||
dbService = (IGenericDBService) GlobalServiceRegister.getDefault().getService(
|
||||
IGenericDBService.class);
|
||||
}
|
||||
if(dbService != null){
|
||||
@@ -411,20 +411,6 @@ public enum EDatabaseConnTemplate {
|
||||
case PSQL:
|
||||
case PLUSPSQL:
|
||||
case GREENPLUM:
|
||||
case PARACCEL:
|
||||
case INGRES:
|
||||
case VECTORWISE:
|
||||
case INTERBASE:
|
||||
case FIREBIRD:
|
||||
case JAVADB_EMBEDED:
|
||||
case JAVADB_JCCJDBC:
|
||||
case JAVADB_DERBYCLIENT:
|
||||
case MAXDB:
|
||||
case IBMDB2:
|
||||
case IBMDB2_ZOS:
|
||||
case HSQLDB_SERVER:
|
||||
case HSQLDB_WEBSERVER:
|
||||
case NETEZZA:
|
||||
return true;
|
||||
default:
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ public enum EDatabaseVersion4Drivers {
|
||||
SQLITE(new DbVersion4Drivers(EDatabaseTypeName.SQLITE, "sqlitejdbc-v056.jar")), //$NON-NLS-1$
|
||||
FIREBIRD(new DbVersion4Drivers(EDatabaseTypeName.FIREBIRD, "jaybird-full-2.1.1.jar")), //$NON-NLS-1$
|
||||
TERADATA(new DbVersion4Drivers(EDatabaseTypeName.TERADATA,
|
||||
new String[] { "terajdbc4-16.20.00.02.jar", "tdgssconfig-16.20.00.02.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
new String[] { "terajdbc4-15.10.00.14.jar", "tdgssconfig-15.10.00.14.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
JAVADB_DERBYCLIENT(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_DERBYCLIENT, "derbyclient.jar")), //$NON-NLS-1$
|
||||
NETEZZA(new DbVersion4Drivers(EDatabaseTypeName.NETEZZA, "nzjdbc.jar")), //$NON-NLS-1$
|
||||
INFORMIX(new DbVersion4Drivers(EDatabaseTypeName.INFORMIX, "ifxjdbc.jar")), //$NON-NLS-1$
|
||||
|
||||
@@ -47,7 +47,6 @@ import org.talend.core.ILibraryManagerService;
|
||||
import org.talend.core.model.general.ILibrariesService;
|
||||
import org.talend.core.runtime.i18n.Messages;
|
||||
import org.talend.repository.ProjectManager;
|
||||
import org.talend.utils.files.FileUtils;
|
||||
import org.talend.utils.xml.XmlUtils;
|
||||
import org.w3c.dom.Attr;
|
||||
import org.w3c.dom.Document;
|
||||
@@ -59,6 +58,9 @@ import org.xml.sax.ErrorHandler;
|
||||
import org.xml.sax.SAXException;
|
||||
import org.xml.sax.SAXParseException;
|
||||
|
||||
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
|
||||
import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
|
||||
|
||||
/**
|
||||
* created by wchen on 2013-3-27 Detailled comment
|
||||
*
|
||||
@@ -237,15 +239,14 @@ public class HadoopCustomLibrariesUtil {
|
||||
|
||||
// save index
|
||||
if (document != null) {
|
||||
// XMLSerializer serializer = new XMLSerializer();
|
||||
// OutputFormat outputFormat = new OutputFormat();
|
||||
// outputFormat.setIndenting(true);
|
||||
// serializer.setOutputFormat(outputFormat);
|
||||
XMLSerializer serializer = new XMLSerializer();
|
||||
OutputFormat outputFormat = new OutputFormat();
|
||||
outputFormat.setIndenting(true);
|
||||
serializer.setOutputFormat(outputFormat);
|
||||
|
||||
output = new OutputStreamWriter(new FileOutputStream(indexFile), "UTF-8"); //$NON-NLS-1$
|
||||
// serializer.setOutputCharStream(output);
|
||||
// serializer.serialize(document);
|
||||
FileUtils.writeXMLFile(document, output);
|
||||
serializer.setOutputCharStream(output);
|
||||
serializer.serialize(document);
|
||||
toExport.put(indexFile.getAbsoluteFile(), new Path(indexFileName));
|
||||
}
|
||||
} finally {
|
||||
|
||||
@@ -54,8 +54,6 @@ public class ConnectionBean implements Cloneable {
|
||||
|
||||
private Map<String, String> dynamicFields = new HashMap<String, String>();
|
||||
|
||||
private static final String TOKEN = "token"; //$NON-NLS-1$
|
||||
|
||||
/**
|
||||
* DOC smallet ConnectionBean constructor comment.
|
||||
*/
|
||||
@@ -283,25 +281,6 @@ public class ConnectionBean implements Cloneable {
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isToken() {
|
||||
try {
|
||||
if (conDetails.has(TOKEN)) {
|
||||
return (Boolean) conDetails.get(TOKEN);
|
||||
}
|
||||
} catch (JSONException e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public void setToken(boolean token) {
|
||||
try {
|
||||
conDetails.put(TOKEN, token);
|
||||
} catch (JSONException e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ConnectionBean clone() throws CloneNotSupportedException {
|
||||
return writeFromJSON(this.getConDetails());
|
||||
@@ -324,7 +303,6 @@ public class ConnectionBean implements Cloneable {
|
||||
toReturn.setPassword(st[i++]);
|
||||
toReturn.setWorkSpace(st[i++]);
|
||||
toReturn.setComplete(new Boolean(st[i++]));
|
||||
toReturn.setToken(new Boolean(st[i++]));
|
||||
JSONObject dynamicJson = new JSONObject();
|
||||
toReturn.getConDetails().put(DYNAMICFIELDS, dynamicJson);
|
||||
while (i < st.length) {
|
||||
|
||||
@@ -434,9 +434,9 @@ public class ModuleNeeded {
|
||||
if (this.getModuleLocaion() != null) {
|
||||
hashCode *= this.getModuleLocaion().hashCode();
|
||||
}
|
||||
if(this.getDefaultMavenURI() != null){
|
||||
hashCode *= this.getDefaultMavenURI().hashCode();
|
||||
}
|
||||
|
||||
hashCode *= this.getDefaultMavenURI().hashCode();
|
||||
|
||||
return hashCode;
|
||||
}
|
||||
|
||||
@@ -519,16 +519,8 @@ public class ModuleNeeded {
|
||||
}
|
||||
|
||||
// maven uri
|
||||
if (other.getDefaultMavenURI() == null) {
|
||||
if (this.getDefaultMavenURI() != null) {
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
if (this.getDefaultMavenURI() == null) {
|
||||
return false;
|
||||
} else if (!other.getDefaultMavenURI().equals(this.getDefaultMavenURI())) {
|
||||
return false;
|
||||
}
|
||||
if (!other.getDefaultMavenURI().equals(this.getDefaultMavenURI())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
@@ -16,7 +16,6 @@ import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.commons.collections.MultiMap;
|
||||
@@ -335,7 +334,7 @@ public class MappingTypeRetriever {
|
||||
return mappingType.getDbType();
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Getter for the current loaded dbms.
|
||||
*
|
||||
|
||||
@@ -16,7 +16,6 @@ import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStreamWriter;
|
||||
import java.io.Writer;
|
||||
import java.net.URL;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
@@ -38,7 +37,6 @@ import org.talend.core.model.metadata.builder.connection.ConnectionFactory;
|
||||
import org.talend.core.model.metadata.builder.connection.SchemaTarget;
|
||||
import org.talend.core.model.metadata.types.PerlTypesManager;
|
||||
import org.talend.cwm.helper.TaggedValueHelper;
|
||||
import org.talend.utils.files.FileUtils;
|
||||
import org.talend.utils.xml.XmlUtils;
|
||||
import org.w3c.dom.Attr;
|
||||
import org.w3c.dom.Document;
|
||||
@@ -50,6 +48,9 @@ import org.xml.sax.ErrorHandler;
|
||||
import org.xml.sax.SAXException;
|
||||
import org.xml.sax.SAXParseException;
|
||||
|
||||
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
|
||||
import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
|
||||
|
||||
import orgomg.cwm.objectmodel.core.TaggedValue;
|
||||
|
||||
/**
|
||||
@@ -672,9 +673,9 @@ public class MetadataSchema {
|
||||
}
|
||||
|
||||
// use specific Xerces class to write DOM-data to a file:
|
||||
Writer writer = new java.io.FileWriter(file);
|
||||
FileUtils.writeXMLFile(document, writer);
|
||||
writer.close();
|
||||
XMLSerializer serializer = new XMLSerializer();
|
||||
serializer.setOutputCharStream(new java.io.FileWriter(file));
|
||||
serializer.serialize(document);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -863,7 +864,10 @@ public class MetadataSchema {
|
||||
return;
|
||||
}
|
||||
// use specific Xerces class to write DOM-data to a file:
|
||||
|
||||
XMLSerializer serializer = new XMLSerializer();
|
||||
OutputFormat outputFormat = new OutputFormat();
|
||||
outputFormat.setIndenting(true);
|
||||
serializer.setOutputFormat(outputFormat);
|
||||
|
||||
// java.io.FileWriter fileWriter = new java.io.FileWriter(file);
|
||||
// serializer.setOutputCharStream(fileWriter);
|
||||
@@ -882,7 +886,9 @@ public class MetadataSchema {
|
||||
// fileWriter.close();
|
||||
// fileWriter = null;
|
||||
OutputStreamWriter output = new OutputStreamWriter(new FileOutputStream(file), "UTF-8"); //$NON-NLS-1$
|
||||
FileUtils.writeXMLFile(document, output);
|
||||
serializer.setOutputCharStream(output);
|
||||
serializer.serialize(document);
|
||||
output.close();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -153,7 +153,7 @@ public class MetadataTable implements IMetadataTable, Cloneable {
|
||||
List<IMetadataColumn> temp = new ArrayList<IMetadataColumn>();
|
||||
temp.addAll(this.listColumns);
|
||||
temp.addAll(this.unusedColumns);
|
||||
if (originalColumns != null) {
|
||||
if (isRepository && originalColumns != null) {
|
||||
Collections.sort(temp, new Comparator<IMetadataColumn>() {
|
||||
|
||||
@Override
|
||||
|
||||
@@ -213,7 +213,6 @@ public final class MetadataToolAvroHelper {
|
||||
//ignore it now as we can't process the complex expression for the default value, and the default value is not useful for runtime like the old javajet tjdbcxxx
|
||||
//TODO support the expression calculate, not sure it's necessary and sometimes, more complex like globalMap.get(xxx) which only have meaning after running the job.
|
||||
ExceptionHandler.process(e, Level.WARN);
|
||||
defaultValue = null;
|
||||
}
|
||||
|
||||
// Types with Document/Unknown elements, store as binary
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user