Compare commits

...

14 Commits

Author SHA1 Message Date
Chao MENG
f0aca307c9 feat(TUP-30475): Test of lite studio 2021-03-26 19:44:34 +08:00
Chao MENG
883ad0cf5d feat(TUP-30475): Test of lite studio 2021-03-26 16:41:11 +08:00
Chao MENG
81a1ac721d Merge remote-tracking branch 'origin/master' into studiolite/TUP-30475 2021-03-25 14:31:39 +08:00
Chao MENG
ae40cb48a9 Merge remote-tracking branch 'origin/master' into studiolite/TUP-30475 2021-03-23 16:11:57 +08:00
Chao MENG
1247d3e499 feat(TUP-30475): Test of lite studio 2021-03-17 15:25:40 +08:00
Chao MENG
c9071b4726 Merge remote-tracking branch 'origin/master' into studiolite/TUP-30475 2021-03-11 18:14:38 +08:00
Chao MENG
ade6d954e7 Merge remote-tracking branch 'origin/master' into studiolite/TUP-30475
Conflicts:
	main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/IMigrateDIMetadataItemService.java
2021-03-08 15:26:12 +08:00
Chao MENG
cc2a0177a7 feat(TUP-30475): Test of lite studio 2021-03-03 20:00:32 +08:00
Chao MENG
491ac6ad65 feat(TUP-30475): Test of lite studio 2021-03-02 23:41:51 +08:00
Chao MENG
fcb1883318 feat(TUP-30475): Test of lite studio 2021-03-02 16:12:29 +08:00
Chao MENG
cb35e08709 Merge remote-tracking branch 'origin/master' into studiolite/TUP-30475 2021-03-02 10:19:12 +08:00
Chao MENG
78b8feaafd feat(TUP-30475): Test of lite studio 2021-02-26 16:14:08 +08:00
Chao MENG
ef1b233aa6 Merge remote-tracking branch 'origin/master' into studiolite/TUP-30475 2021-02-24 16:42:35 +08:00
Nicolas Rousseau
c01723f33e feat(TUP-30475): Test of lite studio 2021-02-19 18:12:55 +08:00
16 changed files with 786 additions and 232 deletions

View File

@@ -1,26 +1,85 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.talend.commons.feature"
label="Commons Feature"
version="7.4.1.qualifier"
provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#commons-feature">
Complete description about this feature at http://www.talend.com/online/featuresdescription.html#commons-feature
</description>
<copyright url="http://www.talend.com/online/copyright.txt">
Copyright Talend 2006, 2007
</copyright>
<license>
The licence are describe in branding feature
</license>
<url>
<discovery label="Talend web site" url="http://www.talend.com"/>
</url>
<requires>
<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="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"/>
<import plugin="org.apache.xerces" version="0.0.0" match="greaterOrEqual"/>
</requires>
<plugin
id="org.talend.common.ui.runtime"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.common.ui.runtime.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.commons.runtime"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.commons.runtime.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.commons.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.commons.ui.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.libraries.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<feature id="org.talend.commons.feature" label="Commons Feature" version="7.4.1.qualifier" provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#commons-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#commons-feature</description>
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
<license>The licence are describe in branding feature</license>
<url>
<discovery label="Talend web site" url="http://www.talend.com"/>
</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="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"/>
<import plugin="org.apache.xerces" version="0.0.0" match="greaterOrEqual"/>
</requires>
<plugin id="org.talend.common.ui.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.common.ui.runtime.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.commons.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.commons.runtime.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.commons.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.commons.ui.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.libraries.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
</feature>

View File

@@ -1,76 +1,275 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.talend.core.feature"
label="Core Feature"
version="7.4.1.qualifier"
provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#core-feature">
Complete description about this feature at http://www.talend.com/online/featuresdescription.html#core-feature
</description>
<copyright url="http://www.talend.com/online/copyright.txt">
Copyright Talend 2006, 2007
</copyright>
<license>
The licence are describe in branding feature
</license>
<url>
<discovery label="Talend web site" url="http://www.talend.com"/>
</url>
<requires>
<import plugin="javax.wsdl" version="1.6.2" match="greaterOrEqual"/>
<import feature="org.eclipse.draw2d" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.common" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.ecore" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.ecore.edit" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.edit" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.transaction" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.validation" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.workspace" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.gef" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.jdt.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.platform.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.tos.libraries.feature" version="0.0.0" match="greaterOrEqual"/>
<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"/>
<import plugin="org.apache.commons.discovery" version="0.0.0" match="greaterOrEqual"/>
<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.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"/>
<plugin
id="org.talend.core.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.core.repository"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.core.repository.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.core.runtime"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.core.runtime.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.core.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.core.ui.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.cwm.mip"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.cwm.mip.edit"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.datatools.xml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.designer.maven.aether"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.librariesmanager"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.talend.librariesmanager.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.librariesmanager.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.librariesmanager.ui.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.maven.resolver"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.metadata.managment"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.metadata.managment.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.metadata.managment.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.metadata.managment.ui.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.migrationTool"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<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.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"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.resources"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.talend.resources.nl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.talend.themes.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<feature id="org.talend.core.feature" label="Core Feature" version="7.4.1.qualifier" provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#core-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#core-feature</description>
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
<license>The licence are describe in branding feature</license>
<url>
<discovery label="Talend web site" url="http://www.talend.com"/>
</url>
<requires>
<import plugin="javax.wsdl" version="1.6.2" match="greaterOrEqual"/>
<import feature="org.eclipse.draw2d" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.common" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.ecore" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.ecore.edit" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.edit" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.transaction" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.validation" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.workspace" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.gef" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.gmf.runtime.notation" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.jdt.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.platform.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.talend.tos.libraries.feature" version="0.0.0" match="greaterOrEqual"/>
<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"/>
<import plugin="org.apache.commons.discovery" version="0.0.0" match="greaterOrEqual"/>
<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.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"/>
<plugin id="org.talend.core.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.core.repository" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.core.repository.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.core.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.core.runtime.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.core.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.core.ui.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.cwm.mip" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.cwm.mip.edit" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.datatools.xml" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.designer.maven.aether" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.librariesmanager" download-size="0" install-size="0" version="0.0.0"/>
<plugin id="org.talend.librariesmanager.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.librariesmanager.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.librariesmanager.ui.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.maven.resolver" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.metadata.managment" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.metadata.managment.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.metadata.managment.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.metadata.managment.ui.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.migrationTool" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<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 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"/>
<plugin id="org.talend.resources.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
<plugin id="org.talend.themes.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
</feature>

View File

@@ -1,36 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.talend.jdt.feature"
label="Feature"
version="7.4.1.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]
</description>
<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>
<license url="http://www.example.com/license">
[Enter License Description here.]
</license>
<requires>
<import plugin="org.eclipse.jdt" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.annotation" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.apt.core" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.apt.pluggable.core" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.apt.ui" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.compiler.apt" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.compiler.tool" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core" version="3.16.0.xx-201903290056-e1812-RELEASE" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core.manipulation" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.debug" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.debug.ui" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.launching" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.ui" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.hamcrest.core" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.junit" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.groovy.core" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.codehaus.groovy" version="2.4.16" match="equivalent"/>
</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"/>
<feature id="org.talend.jdt.feature" label="Feature" version="7.4.1.qualifier">
<description url="http://www.example.com/description">[Enter Feature Description here.]</description>
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
<license url="http://www.example.com/license">[Enter License Description here.]</license>
<requires>
<!-- bonita requires org.codehaus.groovy version 2.4.16.xx-201903290056-e1812-RELEASE -->
<import plugin="org.codehaus.groovy" version="2.4.16.xx-201903290056-e1812-RELEASE" match="perfect"/>
<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"/>
<import plugin="org.eclipse.jdt.annotation" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.apt.core" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.apt.pluggable.core" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.apt.ui" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.compiler.apt" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.compiler.tool" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core" version="3.16.0.xx-201903290056-e1812-RELEASE" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core.manipulation" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.debug" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.debug.ui" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.doc.user" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.groovy.core" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.junit" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.junit.core" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.junit.runtime" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.junit4.runtime" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.launching" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.ui" version="0.0.0" match="greaterOrEqual"/>
<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"/>
</feature>

View File

@@ -15,6 +15,7 @@ package org.talend.commons.utils;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Optional;
@@ -352,6 +353,12 @@ public class VersionUtils {
}
}
public static File getStudioConfigFile() throws Exception {
URL configLocation = new URL("platform:/config/config.ini"); //$NON-NLS-1$
URL fileUrl = FileLocator.toFileURL(configLocation);
return URIUtil.toFile(new URI(fileUrl.getProtocol(), fileUrl.getPath(), fileUrl.getQuery()));
}
public static String getSimplifiedPatchName(String projectPatchName) {
if (projectPatchName != null) {

View File

@@ -1,34 +0,0 @@
// ============================================================================
//
// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.core;
import org.talend.core.model.properties.Item;
import org.talend.migration.IMigrationTask.ExecutionResult;
/**
* DOC bZhou class global comment. Detailled comment
*/
public interface IMigrateDIMetadataItemService extends IService {
/**
* DOC bZhou Comment method "migrateDIItems".
*
* This method to invode the migration task in DI to do migration when import items from DQ perspective.
*
* It should be removed after merge the migrate mechanism.
*
* @param item
* @return
*/
ExecutionResult migrateDIItems(Item item);
}

View File

@@ -12,13 +12,19 @@
// ============================================================================
package org.talend.core;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.nio.file.Files;
import java.util.Properties;
import org.apache.log4j.Logger;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
import org.osgi.framework.Bundle;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.commons.utils.VersionUtils;
/**
* This class can check whether some specific plugins are loaded or not. <br/>
@@ -62,6 +68,8 @@ public class PluginChecker {
private static final String PREVIEW_PLUGIN_ID = "org.talend.designer.component.preview"; //$NON-NLS-1$
private static final String REMOTE_PROVIDER_PLUGIN_ID = "org.talend.repository.remoteprovider"; //$NON-NLS-1$
private static final String SVN_PROVIDER_PLUGIN_ID = "org.talend.repository.svnprovider"; //$NON-NLS-1$
private static final String GIT_PROVIDER_PLUGIN_ID = "org.talend.repository.gitprovider"; //$NON-NLS-1$
@@ -140,6 +148,8 @@ public class PluginChecker {
public static final String APACHE_CXF_PLUGIN_ID = "org.talend.libraries.apache.cxf"; //$NON-NLS-1$
private static Boolean isStudioLite;
/**
* Check if specific plug-in is loaded.
*
@@ -158,6 +168,23 @@ public class PluginChecker {
return isJobLetPluginLoaded();
}
public static boolean isStudioLite() {
if (isStudioLite == null) {
try {
File studioConfigFile = VersionUtils.getStudioConfigFile();
Properties props = new Properties();
try (BufferedReader reader = Files.newBufferedReader(studioConfigFile.toPath())) {
props.load(reader);
}
isStudioLite = Boolean.valueOf(props.getProperty("talend.studio.lite"));
} catch (Exception e) {
isStudioLite = false;
ExceptionHandler.process(e);
}
}
return isStudioLite;
}
public static boolean isRefProjectLoaded() {
return isPluginLoaded(REF_PROJECT_PLUGIN_ID);
}
@@ -259,6 +286,10 @@ public class PluginChecker {
return isPluginLoaded(PREVIEW_PLUGIN_ID);
}
public static boolean isRemoteProviderPluginLoaded() {
return isPluginLoaded(REMOTE_PROVIDER_PLUGIN_ID);
}
public static boolean isSVNProviderPluginLoaded() {
return isPluginLoaded(SVN_PROVIDER_PLUGIN_ID);
}

View File

@@ -119,7 +119,7 @@ public final class RepositoryManager {
}
public static void syncUserComponents() {
if (PluginChecker.isSVNProviderPluginLoaded()) {
if (PluginChecker.isRemoteProviderPluginLoaded()) {
IComponentsService codeGenService = (IComponentsService) GlobalServiceRegister.getDefault().getService(
IComponentsService.class);
if (codeGenService != null) {

View File

@@ -35,7 +35,8 @@ public class ExternalNodesFactory {
try {
listComponents = ExtensionImplementationProvider.getInstance(ExtensionPointFactory.EXTERNAL_COMPONENT, extensionId);
} catch (IllegalPluginConfigurationException e) {
throw new RuntimeException("plugin:" + extensionId + " not found", e); //$NON-NLS-1$ //$NON-NLS-2$
// throw new RuntimeException("plugin:" + extensionId + " not found", e); //$NON-NLS-1$ //$NON-NLS-2$
return null; //temporary
}
return listComponents.get(0);
}

View File

@@ -28,6 +28,18 @@
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.talend.studio</groupId>
<artifactId>studio-tck_m2-dependencies</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.talend.studio</groupId>
<artifactId>studio-tck_sdk-dependencies</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.talend.studio</groupId>
<artifactId>studio-tacokit-dependencies</artifactId>

View File

@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>studio-tcompv1-dependencies</artifactId>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>studio-tck_m2-dependencies</artifactId>
<packaging>pom</packaging>
<repositories>
<repository>
<id>talend_open</id>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
</repository>
<repository>
<id>talend_open_snapshots</id>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
</repository>
<repository>
<id>sonatype_releases</id>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>https://oss.sonatype.org/content/repositories/releases/</url>
</repository>
<repository>
<id>sonatype_snapshots</id>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
</repositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.talend.sdk.component</groupId>
<artifactId>component-runtime</artifactId>
<version>${tcomp.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.talend.sdk.component</groupId>
<artifactId>component-server</artifactId>
<version>${tcomp.version}</version>
</dependency>
<dependency>
<groupId>org.talend.sdk.component</groupId>
<artifactId>component-runtime-di</artifactId>
<version>${tcomp.version}</version>
</dependency>
<dependency>
<groupId>org.talend.sdk.component</groupId>
<artifactId>component-api</artifactId>
<version>${tcomp.version}</version>
</dependency>
<dependency>
<groupId>org.talend.sdk.component</groupId>
<artifactId>slf4j-standard</artifactId>
<version>${tcomp.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeScope>runtime</includeScope>
<outputDirectory>${basedir}/../../tmp/repository</outputDirectory>
<useRepositoryLayout>true</useRepositoryLayout>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -9,12 +9,17 @@
</parent>
<artifactId>studio-tcompv1-dependencies</artifactId>
<packaging>pom</packaging>
<properties>
<tcomp.version>1.31.0</tcomp.version>
<slf4j.version>1.7.25</slf4j.version>
</properties>
<modules>
<module>m2</module>
<module>studio_sdk</module>
</modules>
<repositories>
<repository>
<id>talend_open</id>
@@ -57,57 +62,7 @@
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
</repositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.talend.sdk.component</groupId>
<artifactId>component-runtime</artifactId>
<version>${tcomp.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.talend.sdk.component</groupId>
<artifactId>component-server</artifactId>
<version>${tcomp.version}</version>
</dependency>
<dependency>
<groupId>org.talend.sdk.component</groupId>
<artifactId>component-runtime-di</artifactId>
<version>${tcomp.version}</version>
</dependency>
<dependency>
<groupId>org.talend.sdk.component</groupId>
<artifactId>component-api</artifactId>
<version>${tcomp.version}</version>
</dependency>
<dependency>
<groupId>org.talend.sdk.component</groupId>
<artifactId>slf4j-standard</artifactId>
<version>${tcomp.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>

View File

@@ -0,0 +1,164 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>studio-tcompv1-dependencies</artifactId>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>studio-tck_sdk-dependencies</artifactId>
<packaging>pom</packaging>
<properties>
<commons-lang3.version>3.11</commons-lang3.version>
<mockito.version>2.23.0</mockito.version>
<oro.version>2.0.8</oro.version>
<log4j.version>1.2.17</log4j.version>
<system-rules.version>1.16.0</system-rules.version>
<common-io.version>2.5</common-io.version>
<commons-lang.version>2.6</commons-lang.version>
<junit5.version>5.7.0</junit5.version>
<commons-cli.version>1.4</commons-cli.version>
<xbean.version>4.18</xbean.version>
</properties>
<repositories>
<repository>
<id>talend_open</id>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
</repository>
<repository>
<id>talend_open_snapshots</id>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
</repository>
<repository>
<id>sonatype_releases</id>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>https://oss.sonatype.org/content/repositories/releases/</url>
</repository>
<repository>
<id>sonatype_snapshots</id>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
</repositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.talend.sdk.component</groupId>
<artifactId>component-studio</artifactId>
<version>${tcomp.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.talend.sdk.component</groupId>
<artifactId>component-server-model</artifactId>
</dependency>
<dependency>
<groupId>org.talend.sdk.component</groupId>
<artifactId>component-form-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.talend.sdk.component</groupId>
<artifactId>component-form-model</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj</artifactId>
<version>2.4.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>${oro.version}</version>
<scope>provided</scope>
</dependency>
<dependency> <!-- needed by tomcat-websocket -->
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-websocket</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-json_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsonb_1.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jsonb</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeScope>runtime</includeScope>
<outputDirectory>${basedir}/../../tmp/repository</outputDirectory>
<useRepositoryLayout>true</useRepositoryLayout>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -115,7 +115,7 @@ public class RemoteModulesHelper {
@Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
final Set<String> mavenUrisTofetch = new HashSet<String>(contextMap.keySet());
if (LibraryDataService.getInstance().isBuildLibrariesData()) {
if (LibraryDataService.isBuildLibrariesData()) {
LibraryDataService.getInstance().buildLibraryLicenseData(mavenUrisTofetch);
}
monitor.beginTask(Messages.getString("RemoteModulesHelper.fetch.module.info"), mavenUrisTofetch.size() * 10 + 10);//$NON-NLS-1$

View File

@@ -67,11 +67,17 @@ public class LibraryDataService {
private static boolean buildLibraryIfFileMissing = true;
private boolean buildLibraryLicense = false;
/**
* make it as static to avoid call of getInstance, so that we can avoid dead lock in some cases
*/
private static boolean buildLibraryLicense = Boolean
.valueOf(System.getProperty(KEY_LIBRARIES_BUILD_LICENSE, Boolean.FALSE.toString()));
private boolean buildLibraryIfLicenseMissing = false;
private static boolean buildLibraryIfLicenseMissing = Boolean
.valueOf(System.getProperty(KEY_BUILD_LIBRARY_IF_LICENSE_MISSING, Boolean.FALSE.toString()));
private boolean buildLibraryJarFile = false;
private static boolean buildLibraryJarFile = Boolean
.valueOf(System.getProperty(KEY_LIBRARIES_BUILD_JAR, Boolean.FALSE.toString()));
private static final Map<String, Library> mvnToLibraryMap = new ConcurrentHashMap<String, Library>();
@@ -86,10 +92,6 @@ public class LibraryDataService {
private LibraryLicense unknownLicense;;
private LibraryDataService() {
buildLibraryLicense = Boolean.valueOf(System.getProperty(KEY_LIBRARIES_BUILD_LICENSE, Boolean.FALSE.toString()));
buildLibraryIfLicenseMissing = Boolean
.valueOf(System.getProperty(KEY_BUILD_LIBRARY_IF_LICENSE_MISSING, Boolean.FALSE.toString()));
buildLibraryJarFile = Boolean.valueOf(System.getProperty(KEY_LIBRARIES_BUILD_JAR, Boolean.FALSE.toString()));
File studioLibraryDataFile = getStudioLibraryDataFile();
if (buildLibraryLicense) {
if (studioLibraryDataFile.exists()) {
@@ -329,7 +331,11 @@ public class LibraryDataService {
return value.toString();
}
public boolean isBuildLibrariesData() {
public static boolean isBuildLibrariesData() {
/**
* make the method as static to avoid call of getInstance, so that we can avoid dead lock in some cases
*/
if (buildLibraryLicense) {
return true;
}
@@ -348,7 +354,7 @@ public class LibraryDataService {
return new File(Platform.getConfigurationLocation().getURL().getPath(), LIBRARIES_DATA_FILE_NAME);
}
private File getStudioLibraryDataFile() {
private static File getStudioLibraryDataFile() {
String folder = System.getProperty(KEY_LIBRARIES_DATA_FOLDER);
if (folder == null) {
folder = new File(Platform.getInstallLocation().getURL().getPath(), "configuration").getAbsolutePath(); //$NON-NLS-1$

View File

@@ -376,7 +376,7 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
String hideUpdateSiteId = "org.talend.rcp.hideUpdatesite"; //$NON-NLS-1$
Set<String> enabledActivities = new HashSet<String>();
enabledActivities.addAll(activitySupport.getActivityManager().getEnabledActivityIds());
if (!PluginChecker.isSVNProviderPluginLoaded()) {
if (!PluginChecker.isRemoteProviderPluginLoaded()) {
if (activitySupport.getActivityManager().getActivity(hideUpdateSiteId).isDefined()) {
enabledActivities.remove(hideUpdateSiteId);
}

View File

@@ -18,6 +18,7 @@ import java.util.List;
import org.eclipse.jface.preference.IPreferenceStore;
import org.talend.core.CorePlugin;
import org.talend.core.PluginChecker;
import org.talend.core.model.repository.ERepositoryObjectType;
import org.talend.core.model.repository.IRepositoryViewObject;
import org.talend.core.prefs.ITalendCorePrefConstants;
@@ -37,9 +38,14 @@ public class DynamicContentProviderGeneric extends DynamicContentProvider {
@Override
public void createContent(String id, Element parent) {
String dBranding = "default";
String branding = System.getProperty("talend.license.branding");
if (branding == null || "".equals(branding)) {
branding = dBranding;
String branding = null;
if (PluginChecker.isStudioLite()) {
branding = "LITE";
} else {
System.getProperty("talend.license.branding");
if (branding == null || "".equals(branding)) {
branding = dBranding;
}
}
Document dom = parent.getOwnerDocument();