Compare commits

..

58 Commits

Author SHA1 Message Date
SunChaoqun
c9d5c32b50 Fix the issue when using TOS missing commons-lang3-3.11 2021-06-30 17:24:30 +08:00
Chao MENG
eee3febc64 fix(TUP-31997): Commandline fails start studio with error 'Could not load SWT library' on Ubuntu 18 LTS without UI (#4393)
* chore: try to avoid swt jni loading issue in commandline

* chore: try to avoid swt jni loading issue in commandline
2021-06-29 11:54:21 +08:00
Zhiwei Xue
fb350a5c17 feat(TUP-31886):Support login tasks to run in background (#4387) 2021-06-25 14:36:51 +08:00
Zhiwei Xue
ca6cc22ba0 feat(TUP-31214):Improve component cache and lazy loading (#4320)
* feat(TUP-29651): Components loading improvement (#4247)

* feat(TUP-29651): partially load components

* feat(TUP-29651): partially load components

* feat(TUP-29651): other oprimization

* feat(TUP-29651): fix saveResource

* feat(TUP-29651): fix junit

* feat(TUP-29651): revert index calculation

* feat(TUP-29651): fix plugin.xml

* feat(TUP-29651): refactor load joblet components

* feat(TUP-29651): revert unnecessary changes

Co-authored-by: bhe-talendbj <bhe@talend.com>

* feat(TUP-31214):Improve component cache and lazy loading

* item(TUP-29873): Improve performance effected by dynamic distribution
(#4324)

* item(TUP-29873): Improve performance effected by dynamic distribution

https://jira.talendforge.org/browse/TUP-29873



* item(TUP-29873): Improve performance effected by dynamic distribution

https://jira.talendforge.org/browse/TUP-29873



Co-authored-by: Chao MENG <cmeng@talend.com>

* feat(TUP-31214): fix reset for ModulesNeededProvider

* feat(TUP-31214): fix generating index problem

* feat(TUP-31214): full lazy load for ComponentsFactory
feat(TUP-31577): Improve speed of installation of routines / root poms

* feat(TUP-29653):Improve Tacokit loading

* feat(TUP-31879):Improve performance for checking network for welcome
page

* feat(TUP-31577):fix custom jar cache init problem

Co-authored-by: bhe-talendbj <bhe@talend.com>
Co-authored-by: Chao MENG <cmeng@talend.com>
2021-06-25 14:15:57 +08:00
kjwang
69fa22f6f5 TUP-31795 Add a parameter to setup a JVM for runtime / build with Java 8 (#4384)
* TUP-31795 Add a parameter to setup a JVM for runtime / build with Java 8
https://jira.talendforge.org/browse/TUP-31795
2021-06-24 19:11:51 +08:00
Xilai Dai
db654746c1 Feature/master/tesb 32199 (#4380)
* TESB-32475: Add camel family property on project level

* TESB-32475:Add camel family property on project level

* Create Camel 3 Project by default

* Create Camel 3 Project by default

* Remove null dependencies

* Auto Convert Camel 2 -> Camel 3

* Bean dependencies:
Camel3 already included related jar file so the jars which needed be
imported in Camel2 should remove.

* APPINT-32438:Camel 3: Build a 7.4.1 Studio supporting Camel 3

* APPINT-33007:
Code cleanup related to Camel 3 support only

* APPINT-33007:Code cleanup related to Camel 3 support only

* APPINT-32438 Icons update

Co-authored-by: SunChaoqun <csun@talend.com>
Co-authored-by: apoltavtsev <apoltavtsev@gmail.com>
2021-06-24 11:03:31 +02:00
kjwang
513997726f TUP-31081 Improve download of jars from the studio (#4358)
* TUP-31081 Improve download of jars from the studio
https://jira.talendforge.org/browse/TUP-31081
2021-06-24 15:04:11 +08:00
nrousseau
cda9d85938 feat(TUP-31484) fix issues with eclipse upgrade (#4389) 2021-06-23 15:26:36 +08:00
sbliu
c028037013 feat(TUP-30834) backport - fix ClassCastException (#4388) 2021-06-22 10:52:40 +08:00
hzhao-talendbj
9628d3377a feat(TUP-29701): upgrade eclipse (#3966)
* feat(TUP-29701): upgrade eclipse

* change assert

* fix assert issue

* fix compilation error

* change StringMatcher

* change to apache StringUtils because split function was removed from
eclipse one

* change manifest

* TUP-29701 modify pom to fix NoClassDefFoundError:
com/sun/jna/platform/win32/VersionHelpers

* TUP-29701  change pom for jna

* TUP-29701 try add javax.inject to require bundle

* TUP-29701 try add javax.inject to manifest

* TUP-29701 fix missing required class when start studio

* TUP-29701 change to public

* TUP-31484 fix xerces issue

* TUP-31484 add plugins to features to make it exist in license

* try change version to force use 1.68.0
org.bouncycastle.bcprov 1.68.0
2021-06-18 17:36:29 +08:00
jiezhang-tlnd
cea69e78d5 feat(TUP-31122)new Data Center in AWS Australia (#4342)
https://jira.talendforge.org/browse/TUP-31122

Co-authored-by: jie.zhang <jie.zhang@LT-DDC8R73.talend.com>
2021-06-18 12:06:11 +08:00
zyuan-talend
6063838154 feat(TUP-26268): fix the NPE. (#4378) (#4381) 2021-06-17 10:47:48 +08:00
hcyi
ba13aa44e0 fix(TUP-31238):Library sync with JFrog/Nexus on studio startup doesn't use proxy. (#4357)
* fix(TUP-31238):Library sync with JFrog/Nexus on studio startup doesn't
use proxy.

* fix(TUP-31238):improve for Library sync with JFrog/Nexus on studio
startup doesn't use proxy.

* fix(TUP-31238):add log for Library sync with JFrog/Nexus on studio
startup doesn't use proxy.
2021-06-11 17:26:03 +08:00
Zhiwei Xue
df65549c46 fix(TUP-31759):fix codes install issues on CI (#4374) 2021-06-11 15:51:30 +08:00
Xilai Dai
87f5232e74 APPINT-33200 update the maven-jar-plugin, maven-bundle-plugin (#4366)
* APPINT-33200 update the maven-jar-plugin, maven-bundle-plugin

* APPINT-33200 update the pom_project_template.xml
2021-06-10 19:05:43 +08:00
zyuan-talend
1fcea62d28 feat(TUP-26268): Add button of manipulating Db Column field. (#4354) (#4370)
* feat(TUP-26268): Add button of manipulating Db Column field.
2021-06-10 18:58:40 +08:00
Jane Ding
77833ed44c fix(TUP-31159):When use remote mode with Custom log / unlocked, have (#4325) (#4371)
only one popup of commit
https://jira.talendforge.org/browse/TUP-31159
2021-06-10 17:43:31 +08:00
chmyga
a6810bf733 chore(TDI-46267): bump connectors to 1.23.0-SNAPSHOT (#4364)
Co-authored-by: Dmytro Chmyga <dmytro.chmyga@globallogic.com>
2021-06-09 14:13:34 +03:00
Xilai Dai
84f6219d5f APPINT-32986 update the pom_project_template.xml (#4361) 2021-06-09 18:23:07 +08:00
Chao MENG
42f187c8e2 fix(TUP-31796): Pictures in welcom page are missing (#4360)
https://jira.talendforge.org/browse/TUP-31796
2021-06-09 16:31:30 +08:00
sbliu
1560e256dc feat(TUP-30489) add progress bar to indicate install patch. (#4347) 2021-06-08 14:46:03 +08:00
sbliu
59207f8232 fix(TUP-31252) Improve the data collector for AMC. (#4350) 2021-06-08 14:25:49 +08:00
Xilai Dai
82966f5ba8 chore(APPINT-32986) upgrade commons-io to 2.8.0 (#4345) 2021-06-07 18:01:47 +08:00
bhe-talendbj
03cdc22509 fix(TUP-31729): add missing com.fasterxml.jackson:jackon-bom:2.10.0:pom and com.fasterxml.jackson:oss-parent:38:pom (#4348) 2021-06-07 17:26:03 +08:00
Emmanuel GALLOIS
43fc091be8 feat(TDI-46215): bump component-runtime to 1.33.1 (#4338) 2021-06-07 09:44:44 +02:00
bhe-talendbj
4c41c51472 fix(TUP-31580): execlude other dependencies (#4352) 2021-06-07 15:11:58 +08:00
bhe-talendbj
c226736a04 fix(TUP-31580): replace javascriptengine (#4334) (#4344)
* fix(TUP-31580): replace javascriptengine

* fix(TUP-31580): fix test case

* fix(TUP-31580): fix test case
2021-06-04 09:58:22 +08:00
sbliu
79da2594c0 feat(TUP-30834) remove extra tag. (#4343) 2021-06-03 12:20:59 +08:00
sbliu
13f057c49e feat(TUP-30834) fix unit test failure introduced by api change. (#4341) 2021-06-03 10:55:59 +08:00
sbliu
32e8d6357d feat(TUP-30834) add 2 axis2 module to classpath and export package. (#4317)
add 2 axis2 module to classpath and export package.
replace axis1 with axis2 for S56MDMConnetionHelper
remove salesforce code&dependency from tup, adpt the 'create salesforce connection' toolbar action to generic salesforce connection creation action.
2021-06-03 10:34:04 +08:00
zshen-talend
b267b0dc76 fix(TDQ-19437): tDqReportRun failed when dbconneciton is context mode (#4316) 2021-06-02 07:27:40 +00:00
bhe-talendbj
b51103d01b chore(TUP-31095): Use prepareStatement instead of plain sql execution (#4248) (#4331)
* fix(TUP-31095): initial impl

* fix(TUP-31095): initial impl

* chore(TUP-31095): use prepared statement

* chore(TUP-31095): fix param index

* fix(TUP-31095): fix parameter index
2021-06-01 15:13:32 +08:00
jiezhang-tlnd
ccdbc33869 fix(TUP-31527)CVE lucene-queries (#4295)
* fix(TUP-31527)CVE lucene-queries

* CVE: lucene-queries:4.10.4

* CVE: lucene-queries:4.10.4

* remove plugin org.talend.libraries.apache.lucene4

* remove plugin org.talend.libraries.apache.lucene4

* remove org.talend.libraries.apache.lucene4
2021-05-31 17:14:09 +08:00
hcyi
8560039492 fix(TUP-31553):Hadoop Metadata Wizard when using custom distro dialog (#4307)
box doesnt pop up to import dependencies.
2021-05-28 14:37:21 +08:00
Jane Ding
5fbdc38ebf fix(TUP-31316):Error connecting to Azure SQL database with Azure Active (#4271) (#4319)
* fix(TUP-31316):Error connecting to Azure SQL database with Azure Active
directory method
https://jira.talendforge.org/browse/TUP-31316

* fix(TUP-31316):Error connecting to Azure SQL database with Azure Active
directory method
https://jira.talendforge.org/browse/TUP-31316
2021-05-26 17:46:49 +08:00
zyuan-talend
93be98ff85 feat(TUP-30343):have the "Export Dependencies" option checked by default (#4312) (#4314) 2021-05-26 14:32:56 +08:00
bhe-talendbj
b5f39fba54 fix(TUP-31380): port (#4306) 2021-05-26 10:56:49 +08:00
bhe-talendbj
e18b7dfbf5 fix(TUP-31473): add missing parent poms (#4298) 2021-05-26 10:55:57 +08:00
Jane Ding
280be6425f fix(TUP-30849):Improve build Job performance (#4310)
https://jira.talendforge.org/browse/TUP-30849
2021-05-25 18:43:43 +08:00
Jane Ding
ef22ca920f feat(TUP-31117):Improve performances related to recursive jobs (#4292)
* feat(TUP-31117):Improve performances related to recursive jobs
https://jira.talendforge.org/browse/TUP-31117

* feat(TUP-31117):Improve performances related to recursive jobs
https://jira.talendforge.org/browse/TUP-31117

* feat(TUP-31117):Improve performances related to recursive jobs
https://jira.talendforge.org/browse/TUP-31117
2021-05-25 17:43:00 +08:00
jiezhang-tlnd
7b1d49ae69 fix(TUP-31164)Guess schema button on the informix tDBinput component (#4308)
returns zero length datatype
https://jira.talendforge.org/browse/TUP-31164
2021-05-25 15:21:41 +08:00
jiezhang-tlnd
03de72105c chore(TUP-30461)CVE plexus-utils (#4272)
* chore(TUP-30461)CVE plexus-utils

* remove plexus-utils-3.0.17

* remove from classpatch
2021-05-24 15:53:00 +08:00
hcyi
c1398000c1 feat(TUP-30619):Missing Additional parameters in SAP Connection. (#4285)
* feat(TUP-30619):Missing Additional parameters in SAP Connection.

* feat(TUP-30619):update key for Additional parameters in SAP Connection.
2021-05-24 09:52:01 +08:00
kjwang
454d6ecd84 Kjwang/fix tup 31227 studio populate unstaged changes (#4277) (#4302)
TUP-31227 Studio populate UnstagedChanges for Global Routines and SQL
Templates when opening a new Feature Branch
https://jira.talendforge.org/browse/TUP-31227
2021-05-21 14:27:41 +08:00
Chao MENG
7b5f7b3935 feat(TUP-30475): studio lite (#4299)
https://jira.talendforge.org/browse/TUP-30475

Add missing org.talend.migrationTool.nl
2021-05-19 15:33:33 +02:00
Chao MENG
0a1ebc33ac feat(TUP-30475): studio lite (#4286)
https://jira.talendforge.org/browse/TUP-30475
2021-05-18 14:43:36 +08:00
vdrokov
5271d9bdb8 APPINT-32987: Fix dublicate variable (#4279) 2021-05-13 12:08:56 +03:00
sbliu
7b484be397 fix(TUP-31060): store real routine id in case recreated routine with same name. 2021-05-13 10:57:32 +08:00
Jane Ding
895635738f chore(APPINT-32936):CVE:Upgrade commons-codec-1.11 to 1.15 (#4260)
https://jira.talendforge.org/browse/APPINT-32936
2021-05-12 13:59:45 +08:00
hzhao-talendbj
e53ee0fe2e chore(TUP-30255): Upgrade httpclient-4.5.5,4.5.7 to 4.5.13 (#4237) 2021-05-10 18:13:47 +08:00
Denis Sergent
562018e483 Revert "APPINT-32905: Issue with Rest service flow (#4264)" (#4275)
This reverts commit 5f1c19871c.
2021-05-10 11:47:43 +02:00
Jane Ding
03f01de063 fix(TUP-31237):Invalid username or password when creating a Snowflake (#4232) (#4273)
* fix(TUP-31237):Invalid username or password when creating a Snowflake
Metadata Connection with a Snowflake password that has a slash character
https://jira.talendforge.org/browse/TUP-31237

* fix(TUP-31237):Invalid username or password when creating a Snowflake
Metadata Connection with a Snowflake password that has a slash character
https://jira.talendforge.org/browse/TUP-31237
2021-05-10 16:55:54 +08:00
Jane Ding
123a1934e2 chore(TUP-31030):Update CXF to 3.3.10 (#4239)
* chore(TUP-31030):Update CXF to 3.3.10
https://jira.talendforge.org/browse/TUP-31030

* chore(TUP-31030):Update CXF to 3.3.10
https://jira.talendforge.org/browse/TUP-31030
2021-05-10 09:46:42 +08:00
mbasiuk-talend
a38c309608 chore(TDI-46032): bump connectors version to 1.22.0-SNAPSHOT (#4270) 2021-05-08 17:09:13 +08:00
hzhao-talendbj
0eddc3b1b9 fix(TUP-31248):impala metadata connection issues for Cloudera (#4246) (#4252)
* fix(TUP-31248):impala metadata connection issues for Cloudera

* TUP-31248 revert mistake remove

* TUP-31248 remove some useless code

* TUP-31248 add connection info to log when connection failed
2021-05-07 15:46:08 +08:00
kjwang
afe5d2e74b Feat:TUP-30377 Move the "Allow specific characters (UTF8,...)" (#4238) (#4266)
Feat:TUP-30377 Move the "Allow specific characters (UTF8,...) preference
setting to project setting.
https://jira.talendforge.org/browse/TUP-30377
2021-05-06 17:22:35 +08:00
jiezhang-tlnd
c3277931c1 fix(TUP-30451)CVE: (#4256)
maven-shared-utils-3.0.0.jar,maven-shared-utils-3.0.1.jar,maven-shared-utils-3.1.0.jar
2021-05-06 11:01:46 +08:00
vdrokov
5f1c19871c APPINT-32905: Issue with Rest service flow (#4264) 2021-05-05 17:28:43 +03:00
526 changed files with 6441 additions and 15181 deletions

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.babel.all.tos.feature" label="Babel feature with all languages for TOS" version="7.4.1.M9">
<feature id="org.talend.babel.all.tos.feature" label="Babel feature with all languages for TOS" 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>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.common.ui.runtime.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.common.ui.runtime

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.common.ui.runtime.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.commons.runtime.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.commons.runtime

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.runtime.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Commons UI Nl Fragment
Bundle-SymbolicName: org.talend.commons.ui.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.commons.ui
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.ui.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.talend.core.nl Fragment
Bundle-SymbolicName: org.talend.core.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.core
Bundle-Localization: plugin

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.core.repository.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.core.repository

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.repository.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.core.runtime.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.core.runtime

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.runtime.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.core.ui.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.core.ui

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.ui.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.cwm.mip.edit.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.cwm.mip.edit
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.cwm.mip.edit.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.cwm.mip.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.cwm.mip
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.cwm.mip.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Designer Maven UI NL
Bundle-SymbolicName: org.talend.designer.maven.ui.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.designer.maven.ui
Bundle-Vendor: .Talend SA.
Bundle-Localization: plugin

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.maven.ui.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.talend.help.Nl Fragment
Bundle-SymbolicName: org.talend.help.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.help
Bundle-Localization: plugin

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.help.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.talend.helpers.nl Fragment
Bundle-SymbolicName: org.talend.helpers.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.helpers
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.helpers.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.talend.librariesmanager Nl Fragment
Bundle-SymbolicName: org.talend.librariesmanager.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.librariesmanager
Bundle-Localization: plugin
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.librariesmanager.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.librariesmanager.ui.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.librariesmanager.ui

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.librariesmanager.ui.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.metadata.managment.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.metadata.managment

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.metadata.managment.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Metadata Managment UI Nl Fragment
Bundle-SymbolicName: org.talend.metadata.managment.ui.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.metadata.managment.ui
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.metadata.managment.ui.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: MigrationTool Plug-in nl fragment
Bundle-SymbolicName: org.talend.migrationTool.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.migrationTool

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.migrationTool.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Nl Fragment
Bundle-SymbolicName: org.talend.model.edit.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.model.edit
Bundle-Localization: plugin
Bundle-Vendor: %providerName

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.edit.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.talend.model.Nl Fragment
Bundle-SymbolicName: org.talend.model.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.model
Bundle-Localization: plugin

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: NL
Bundle-SymbolicName: org.talend.presentation.onboarding.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.presentation.onboarding

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.presentation.onboarding.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.rcp.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.rcp
Bundle-Localization: plugin
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.registration.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.registration

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.registration.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.repository.items.importexport.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.repository.items.importexport

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.items.importexport.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.repository.items.importexport.ui.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.repository.items.importexport.ui

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Local repository Plug-in Nl Fragment
Bundle-SymbolicName: org.talend.repository.localprovider.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.repository.localprovider
Bundle-Localization: plugin
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.localprovider.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.repository.mdm.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.repository.mdm

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.mdm.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.repository.metadata.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.repository.metadata

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.metadata.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.repository.view.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.repository.view
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.view.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.resources.nl
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Fragment-Host: org.talend.resources

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.resources.nl</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.commons.feature" label="Commons Feature" version="7.4.1.M9" provider-name=".Talend SA.">
<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>
@@ -8,7 +8,7 @@
<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="org.bouncycastle.bcprov" version="1.68.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"/>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.core.feature" label="Core Feature" version="7.4.1.M9" provider-name=".Talend SA.">
<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>
@@ -39,6 +39,7 @@
<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.ops4j.pax.url.mvn" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.collections" 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"/>
@@ -62,6 +63,7 @@
<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.migrationTool.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" 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"/>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.fragment.jars.common.feature"
label="Fragment Jars in Common"
version="7.4.1.M9">
version="7.4.1.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]
@@ -57,11 +57,4 @@
version="0.0.0"
unpack="true"/>
<plugin
id="org.talend.libraries.apache.lucene4"
download-size="0"
install-size="0"
version="0.0.0"
unpack="true"/>
</feature>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.fragment.jars.common.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.help.di.feature"
label="Talend DI help feature"
version="7.4.1.M9"
version="7.4.1.qualifier"
provider-name=".Talend SA.">
<description url="http://www.example.com/description">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.help.di.feature</artifactId>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.help.feature" label="Help Feature" version="7.4.1.M9" provider-name=".Talend SA.">
<feature id="org.talend.help.feature" label="Help Feature" version="7.4.1.qualifier" provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#help-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#help-feature</description>
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
<license>The licence are describe in branding feature</license>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.help.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.jdt.feature"
label="Feature"
version="7.4.1.M9">
version="7.4.1.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.jdt.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="7.4.1.M9" provider-name=".Talend SA.">
<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="7.4.1.qualifier" provider-name=".Talend SA.">
<description url="http://www.example.com/description">[Enter Feature Description here.]</description>
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
<license url="http://www.example.com/license">[Enter License Description here.]</license>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.m2e.feature" label="Feature" version="7.4.1.M9">
<feature id="org.talend.m2e.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>
@@ -38,5 +38,7 @@
<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"/>
<import plugin="org.eclipse.ui.genericeditor" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.ide" version="0.0.0" match="greaterOrEqual"/>
</requires>
</feature>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.m2e.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.platform.feature" label="Platform" version="7.4.1.M9">
<feature id="org.talend.platform.feature" label="Platform" 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>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.rcp.feature"
label="RCP Feature"
version="7.4.1.M9"
version="7.4.1.qualifier"
provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#rcp-feature">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.update.p2.feature" label="P2-feature" version="7.4.1.M9">
<feature id="org.talend.update.p2.feature" label="P2-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>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.update.p2.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.updates.feature" label="Updates-feature" version="7.4.1.M9" provider-name=".Talend SA.">
<feature id="org.talend.updates.feature" label="Updates-feature" version="7.4.1.qualifier" provider-name=".Talend SA.">
<copyright url="http://www.talend.com/about-us">[Enter Copyright Description here.]</copyright>
<plugin id="org.talend.updates.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
</feature>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.updates.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="7.4.1.M9">
<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="7.4.1.qualifier">
<description url="http://www.example.com/description">This feature contains the Talend utilities plugin and its dependencies.</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>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.utils.feature</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Common UI runtime Plug-in
Bundle-SymbolicName: org.talend.common.ui.runtime;singleton:=true
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.apache.commons.collections,
org.talend.libraries.dom4j-jaxen,

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 404 B

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.common.ui.runtime</artifactId>

View File

@@ -132,3 +132,8 @@ GlobalServiceRegister.ServiceNotRegistered=The service {0} has not been register
MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.title=The xml can't parse.
MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.msg=The xml can't parse in this format.
HibernateUtils.auditDBIsNotUsable=The audit database must be empty or only contains tables related to audit.
CasePushButton.CaseButton.Tip=Uppercase/Lowercase Db column
QuotePushButton.QuoteButton.Tip=Add/Remove Quote on Db column
QuoteManipulateDialog.title=Add/Remove quote on Db column
QuoteManipulateDialog.addQuote=Add quote
QuoteManipulateDialog.removeQuote=Remove quote

View File

@@ -88,6 +88,8 @@ public enum EImage implements IImage {
LEFTX_ICON("/icons/leftx.png"), //$NON-NLS-1$
RIGHT_ICON("/icons/right.gif"), //$NON-NLS-1$
RIGHTX_ICON("/icons/rightx.png"), //$NON-NLS-1$
LOWERCASE_ICON("/icons/lowercase.jpg"), //$NON-NLS-1$
UPPERCASE_ICON("/icons/uppercase.jpg"), //$NON-NLS-1$
KEY_ICON("/icons/key.gif"), //$NON-NLS-1$
HIERARCHY_ICON("/icons/hierarchicalLayout.gif"), //$NON-NLS-1$

View File

@@ -14,7 +14,7 @@ package org.talend.commons.ui.runtime.swt.celleditor;
import java.text.MessageFormat;
import org.eclipse.jface.util.Assert;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ComboBoxCellEditor;
import org.eclipse.swt.SWT;

View File

@@ -19,7 +19,7 @@ import java.util.List;
import java.util.Map;
import org.apache.log4j.Logger;
import org.eclipse.jface.util.Assert;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ColumnLayoutData;
import org.eclipse.jface.viewers.ColumnPixelData;

View File

@@ -22,7 +22,7 @@ package org.talend.commons.ui.runtime.swt.tableviewer.behavior;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jface.util.Assert;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.viewers.ColumnLayoutData;
import org.eclipse.jface.viewers.ColumnPixelData;
import org.eclipse.jface.viewers.ColumnWeightData;

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Common Runtime Plug-in
Bundle-SymbolicName: org.talend.commons.runtime;singleton:=true
Bundle-Version: 7.4.1.M9
Bundle-Version: 7.4.1.qualifier
Require-Bundle: org.apache.log4j;visibility:=reexport,
org.apache.commons.commons-beanutils,
org.apache.commons.collections,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.4.1-M9</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.runtime</artifactId>

View File

@@ -0,0 +1,56 @@
package org.talend.commons.runtime.service;
import java.util.Collection;
import java.util.Collections;
import java.util.Properties;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.talend.commons.exception.CommonExceptionHandler;
public interface ICollectDataService {
final String KEY_SOURCE = "source";
//
final String AMC_FILE_TYPE_USED = "FILE_TYPE_USED";
final String AMC_DATABASE_TYPE_USED = "DATABASE_TYPE_USED";
final String AMC_PREVIEW_KEY = "amc.datasource";
final String AMC_PREVIEW_FILEVALUE = "File";
final String AMC_PREVIEW_DATABASEVALUE = "Database";
/**
* @return json string
*/
String getCollectedDataJSON();
Properties getCollectedData();
public static ICollectDataService getInstance(String from) throws Exception {
BundleContext bc = FrameworkUtil.getBundle(ICollectDataService.class).getBundleContext();
Collection<ServiceReference<ICollectDataService>> tacokitServices = Collections.emptyList();
try {
tacokitServices = bc.getServiceReferences(ICollectDataService.class, null);
} catch (InvalidSyntaxException e) {
CommonExceptionHandler.process(e);
}
if (tacokitServices != null) {
for (ServiceReference<ICollectDataService> sr : tacokitServices) {
if (from == null || from.equals(sr.getProperty(KEY_SOURCE))) {
ICollectDataService tacokitService = bc.getService(sr);
if (tacokitService != null) {
return tacokitService;
}
}
}
}
return null;
}
}

View File

@@ -32,10 +32,12 @@ import org.talend.commons.i18n.internal.Messages;
*/
public interface ITaCoKitService {
void start() throws Exception;
void start();
boolean isStarted() throws Exception;
void waitForStart();
String reload(IProgressMonitor monitor) throws Exception;
boolean isTaCoKitCar(File file, IProgressMonitor monitor) throws Exception;
@@ -44,7 +46,7 @@ public interface ITaCoKitService {
boolean isTaCoKitType(Object repoType);
public static ITaCoKitService getInstance() throws Exception {
public static ITaCoKitService getInstance() {
BundleContext bc = FrameworkUtil.getBundle(ITaCoKitService.class).getBundleContext();
Collection<ServiceReference<ITaCoKitService>> tacokitServices = Collections.emptyList();
try {

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