Compare commits

..

39 Commits

Author SHA1 Message Date
Xilai Dai
9e6e5a59a8 (APPINT-33736) fix the osgihelper-maven-plugin version (#4597) 2021-09-15 12:29:17 +02:00
Chao MENG
a879748a00 feat(TUP-32554)feature manager ui (#4595)
Co-authored-by: jiezhang-tlnd <jie.zhang@talend.com>
2021-09-15 16:09:48 +08:00
Jenkins Continuous Build server
73bb3eaa68 Set version to 8.0.1 M12 2021-09-14 13:57:21 +02:00
kjwang
a37d1bcfe0 TUP-32935 new created project not active existing features by default (#4591)
TUP-32935 new created project not active existing features by default and show
https://jira.talendforge.org/browse/TUP-32935
2021-09-14 19:33:33 +08:00
jzhao
ef22b08b21 fix(TDI-46315):sap component and sap metadata have different module name/mvnurl.(#4567) (#4588)
Co-authored-by: hcyi <hcyi@talend.com>
2021-09-14 18:06:09 +08:00
bhe-talendbj
95910aa1e1 fix(TUP-32845): Zero install: install jar to folder .installation\.commandline\configuration\.m2 instead of %userPath%\.m2. (#4566)
* fix(TUP-32845): install jars to custom maven repo

* fix(TUP-32845): install jars for command line

* fix(TUP-32845): revert unnecessary changes

* fix(TUP-32845): set m2 before install components
2021-09-14 16:06:19 +08:00
Xilai Dai
e6fc28716c (APPINT-33709) fix the missing commons-io (#4585) 2021-09-13 16:38:53 +02:00
jiezhang-tlnd
bdd64c2d09 feat(TUP-32850)Remove the welcome page in Studio 8 (#4577)
* feat(TUP-32850)Remove the welcome page in Studio 8

* remove welcome from help menu

* remove java file
2021-09-13 20:16:35 +08:00
Denis Sergent
1c75401de0 Fix for missing uppercase in migration msg (#4583)
* Fix missing uppercase

* Fix missing uppercase

* Update messages_fr.properties

* Fix missing uppercase

* Fix missing uppercase
2021-09-13 07:52:43 +02:00
hzhao-talendbj
a3efa283c8 fix(TUP-32203): Error logs throwed by ci builder when run mvn regenerate (#4581) 2021-09-10 19:09:11 +08:00
Emmanuel GALLOIS
baef5dc541 feat(TDI-46568): bump to component-runtime 1.36.1 (#4580)
* feat(TDI-46568): bump component-runtime to 1.36.0 in Studio 8
* feat(TDI-46568): move dependencies to the correct plugin
- bump jackson and slf4j
* feat(TDI-46568): bump maven tos plugins (TODO check if still relevant)
* feat(TDI-46568): fix missing slf4j-api dep
* feat(TDI-46568): bump to component-runtime 1.36.1
2021-09-10 12:49:34 +02:00
Emmanuel GALLOIS
5c89960c6f feat(TDI-46568): bump component-runtime to 1.36.0 in Studio 8 (#4518)
* feat(TDI-46568): bump component-runtime to 1.36.0 in Studio 8
* feat(TDI-46568): bump component-runtime to 1.36.0 in Studio 8
* feat(TDI-46568): move dependencies to the correct plugin
- bump jackson and slf4j
* feat(TDI-46568): bump maven tos plugins (TODO check if still relevant)
* feat(TDI-46568): fix missing slf4j-api dep
2021-09-10 09:21:17 +02:00
Zhiwei Xue
9a0b732205 chore():fix junit failures (#4579) 2021-09-10 10:03:48 +08:00
Xilai Dai
338054db96 chore(APPINT-33588) upgrade commons-compress to 1.21 (#4561) 2021-09-09 11:47:01 +08:00
sbliu
5b32a19c6e fix(TDI-46252): Studio: MySQL Connection issues due to TLS 1.2 after (#4501) (#4560)
Co-authored-by: wang wei <wwang@talend.com>
2021-09-08 17:52:06 +08:00
sbliu
ea80975577 chore(TUP-32620) add default connection parameter to mysql connection. (#4563) 2021-09-08 17:51:48 +08:00
jiezhang-tlnd
e159dee436 Jzhang/tup 31920 remove all (#4573)
* feat(TUP-31920)Remove additional packages

* TOS still check extraFeatures
2021-09-08 17:30:12 +08:00
hzhao-talendbj
39c72406e2 chore(TUP-32664): CVE: commons-compress-[1.19,1.20] (#4572) 2021-09-08 16:57:48 +08:00
Jane Ding
68e18f3108 feat(TUP-32281):Provide a project analysis report (#4542)
* feat(TUP-32281):Provide a project analysis report
https://jira.talendforge.org/browse/TUP-32281

* feat(TUP-32281):Provide a project analysis report
https://jira.talendforge.org/browse/TUP-32281

* feat(TUP-32281):Provide a project analysis report
https://jira.talendforge.org/browse/TUP-32281

* feat(TUP-32281):Provide a project analysis report
https://jira.talendforge.org/browse/TUP-32281

* feat(TUP-32281):Provide a project analysis report
https://jira.talendforge.org/browse/TUP-32281

* feat(TUP-32281):Provide a project analysis report
https://jira.talendforge.org/browse/TUP-32281

* feat(TUP-32281):Provide a project analysis report
https://jira.talendforge.org/browse/TUP-32281

* feat(TUP-32281):Provide a project analysis report
https://jira.talendforge.org/browse/TUP-32281

* feat(TUP-32281):Provide a project analysis report
https://jira.talendforge.org/browse/TUP-32281

* feat(TUP-32281):Provide a project analysis report
https://jira.talendforge.org/browse/TUP-32281
2021-09-07 17:14:04 +08:00
kjwang
e657fbef6b kjwang/TUP-31732 CVE maven-core-3.0 (#4565)
https://jira.talendforge.org/browse/TUP-31732
2021-09-07 16:02:25 +08:00
Jane Ding
5ef1ac5741 fix(TUP-32765):Review default migration report. (#4559)
https://jira.talendforge.org/browse/TUP-32765
2021-09-06 14:08:08 +08:00
Zhiwei Xue
6b10d9fa86 feat(TUP-30504):Don't commit the poms of jobs in the project (#4558) 2021-09-03 17:23:55 +08:00
bhe-talendbj
82d2b8fcf9 fix(TUP-32804): fix module index (#4557)
* fix(TUP-32804): fix module index

* fix(TUP-32804): revert locallibrarymanager

* fix(TUP-32804): add api to set initialize index

* fix(TUP-32804): set flag to regenerate index

* fix(TUP-32804): add test

* fix(TUP-32804): match jar version to component
2021-09-03 15:15:33 +08:00
Chao MENG
348f83c63c feat(TUP-32555): Create new project: active studio available features. (#4554)
https://jira.talendforge.org/browse/TUP-32555
2021-09-01 22:21:15 +08:00
Chao MENG
5868f91966 feat(TUP-32555): Create new project: active studio available features. (#4553)
https://jira.talendforge.org/browse/TUP-32555
2021-09-01 21:32:37 +08:00
Chao MENG
e12bbdd02a fix(TUP-32739): Feature Manager: for new create project only DI (#4552)
perspective show after all feature install
https://jira.talendforge.org/browse/TUP-32739
2021-09-01 00:34:17 +08:00
hzhao-talendbj
b3fad25bdb feat(TUP-32021):remove Apache SVN (#4511)
* feat(TUP-32021):remove Apache SVN

* feat(TUP-32021):remove Apache SVN

* feat(TUP-32021):remove Apache SVN   revert setAvoidSvnUpdate

* feat(TUP-32021):remove Apache SVN  rename to setAvoidUpdate

* feat(TUP-32021):remove Apache SVN   rename to gitconstant

* feat(TUP-32021):remove Apache SVN   rename to gitconstant

* feat(TUP-32021):remove Apache SVN

* feat(TUP-32021):remove Apache SVN
2021-08-30 16:36:41 +08:00
bhe-talendbj
99fe76b9ca feat(TUP-32643): Project features > Studio features , install featues in background when logon (#4544)
* feat(TUP-32643): add install missing feature interface

* feat(TUP-32643): install in main thread

* feat(TUP-32643): install in main thread

* feat(TUP-32643): install in main thread
2021-08-30 15:09:11 +08:00
sbliu
f6707a9fd1 feat(TUP-32556) remove main menu 'Install Additional Packages...' (#4534) 2021-08-30 14:01:27 +08:00
apoltavtsev
9a9fe80fb9 fix(APPINT-33616) CXF version is changed due to CVE: cxf-rt-rs-json-basic-3.3.10.jar (APPINT-33331) 2021-08-30 07:55:27 +02:00
Chao MENG
615dfcde15 feat(TUP-32441): Project setting : Active/de-active installed features (#4549)
by project.
https://jira.talendforge.org/browse/TUP-32441
2021-08-27 21:53:17 +08:00
hzhao-talendbj
bc467b6852 chore(TUP-32668):CVE: plexus-archiver-3.4 (#4539) 2021-08-27 17:18:31 +08:00
pyzhou
437b2c1629 fix(TDI-46615): resumeutil compiled jdk11 cannot run in jdk 8 (#4535)
* fix(TDI-46615): resumeutil compiled jdk11 cannot run in jdk 8

* fix clear() method
2021-08-27 15:45:45 +08:00
zyuan-talend
3af02dde9c fix(TUP-32567): decode hex value in job script. (#4545) 2021-08-27 14:28:27 +08:00
hcyi
a9e287bcc4 feat(TUP-32623):Studio Lite: Feature Manager - update available. (#4538) 2021-08-27 10:23:28 +08:00
hzhao-talendbj
f72b77f4de chore(TUP-32725): TOS_DI and TOS_BD can't build job (#4543) 2021-08-26 20:23:38 +08:00
AlixMetivier
233f0c2037 fix(TBD-12971): fix NPE when creating DB connection (#4541)
* fix(TBD-12971): fix NPE when creating DB connection

* fix

* fix
2021-08-26 13:07:46 +02:00
AlixMetivier
4965b9039d feat(TBD-12847): add spark universal 2.4 plugin (#4490)
* feat(TBD-12623): add Universal spark 2.4 distribution

* feat(TBD-12847): remove old spark local mode
2021-08-25 16:26:15 +02:00
SunChaoqun
1d77bf0a9e chore(APPINT-33587) upgrade maven-core to 3.8.1 (#4536) 2021-08-25 15:33:17 +08:00
341 changed files with 3131 additions and 4035 deletions

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.commons.feature" label="Commons Feature" version="8.0.1.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.commons.feature" label="Commons Feature" version="8.0.1.M12" 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>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.0.1-M12</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="8.0.1.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.core.feature" label="Core Feature" version="8.0.1.M12" 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>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.0.1-M12</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="8.0.1.qualifier">
version="8.0.1.M12">
<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>8.0.1-SNAPSHOT</version>
<version>8.0.1-M12</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.fragment.jars.common.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="8.0.1.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.help.feature" label="Help Feature" version="8.0.1.M12" 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>8.0.1-SNAPSHOT</version>
<version>8.0.1-M12</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.help.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="8.0.1.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="8.0.1.M12" 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>8.0.1-SNAPSHOT</version>
<version>8.0.1-M12</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.rcp.feature"
label="RCP Feature"
version="8.0.1.qualifier"
version="8.0.1.M12"
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>8.0.1-SNAPSHOT</version>
<version>8.0.1-M12</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="8.0.1.qualifier">
<feature id="org.talend.update.p2.feature" label="P2-feature" version="8.0.1.M12">
<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>8.0.1-SNAPSHOT</version>
<version>8.0.1-M12</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="8.0.1.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.updates.feature" label="Updates-feature" version="8.0.1.M12" 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>8.0.1-SNAPSHOT</version>
<version>8.0.1-M12</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="8.0.1.qualifier">
<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="8.0.1.M12">
<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>8.0.1-SNAPSHOT</version>
<version>8.0.1-M12</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: 8.0.1.qualifier
Bundle-Version: 8.0.1.M12
Require-Bundle: org.eclipse.core.runtime,
org.apache.commons.collections,
org.talend.libraries.dom4j-jaxen,

View File

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

View File

@@ -33,4 +33,6 @@ public interface ColorConstants {
static final Color VERTICAL_SEPERATOR_LINE_COLOR = new Color(null, 162, 179, 195);
static final Color LOCHMARA_COLOR = new Color(null, 6, 117, 193);
static final Color WATHET_COLOR = new Color(null, 135, 206, 235);
}

View File

@@ -49,7 +49,6 @@ public enum ECoreImage implements IImage {
FOLDER_CLOSE_ICON("/icons1/folder_close.png"), //$NON-NLS-1$
FOLDER_WIZ("/icons1/folder_wiz.gif"), //$NON-NLS-1$
SVN_ROOT_ICON("/icons1/svn.gif"), //$NON-NLS-1$
BUSINESS_PROCESS_ICON("/icons1/businessProcess.png"), //$NON-NLS-1$
BUSINESS_PROCESS_WIZ("/icons1/business_wiz.png"), //$NON-NLS-1$
PROCESS_ICON("/icons1/process_icon.png"), //$NON-NLS-1$

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: 8.0.1.qualifier
Bundle-Version: 8.0.1.M12
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>8.0.1-SNAPSHOT</version>
<version>8.0.1-M12</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.runtime</artifactId>

View File

@@ -56,6 +56,19 @@ public class Hex {
return out;
}
public static boolean isNeedConvertToHex(String value) {
if (value == null || "".equals(value.trim())) {
return false;
}
for (int i = 0; i < value.length(); i++) {
int ch = value.charAt(i);
if (ch < 32) {
return true;
}
}
return false;
}
private static int toDigit(char ch, int index) {
int digit = Character.digit(ch, 16);

View File

@@ -46,6 +46,10 @@ public class EclipseCommandLine {
static public final String CLEAN = "-clean"; //$NON-NLS-1$
public static final String PROP_CLEAR_PERSISTED_STATE = "clearPersistedState";
public static final String PROP_DO_CLEAR_PERSISTED_STATE = "-talend.clearPersistedState";
/**
* Use it to specify the type of project that will be use to configure the studio when relaunched
*/

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Common UI Plug-in
Bundle-SymbolicName: org.talend.commons.ui;singleton:=true
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.0.1.M12
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.jface.text,

View File

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

View File

@@ -3,7 +3,7 @@ Automatic-Module-Name: org.talend.core.repository
Bundle-ManifestVersion: 2
Bundle-Name: Core Repository Plug-in
Bundle-SymbolicName: org.talend.core.repository;singleton:=true
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.0.1.M12
Require-Bundle: org.eclipse.ui,
org.eclipse.ui.ide,
org.apache.commons.collections,
@@ -33,7 +33,6 @@ Export-Package: org.talend.core.repository,
org.talend.core.repository.recyclebin,
org.talend.core.repository.seeker,
org.talend.core.repository.services,
org.talend.core.repository.svn,
org.talend.core.repository.ui.actions,
org.talend.core.repository.ui.actions.metadata,
org.talend.core.repository.ui.dialog,

View File

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

View File

@@ -42,20 +42,15 @@ CreateSandboxProjectDialog.Failure=Failure
CreateSandboxProjectDialog.failureMessage=Create sandbox project Failure.
CreateSandboxProjectDialog.ProjectDesc=Description
CreateSandboxProjectDialog.ProjectLabel=Label
CreateSandboxProjectDialog.ProjectSvnAdvance=SVN advanced settings
CreateSandboxProjectDialog.successMessage=Create sandbox project successfully
CreateSandboxProjectDialog.successTitile=Success
CreateSandboxProjectDialog.svnUrl=URL
CreateSandboxProjectDialog.Title=Create sandbox project - {0}
CreateSandboxProjectDialog.userFirstname=First name
CreateSandboxProjectDialog.userLastname=Last name
CreateSandboxProjectDialog.userLoginMessage=The project svn login can't be empty
CreateSandboxProjectDialog.userLoginValidMessage=The user login must be a valid email
CreateSandboxProjectDialog.userPasswordEmptyMessage=The user password can't be empty
CreateSandboxProjectDialog.Login=Login
CreateSandboxProjectDialog.Password=Password
CreateSandboxProjectDialog.URLMessage=Must set the svn URL
CreateSandboxProjectDialog.userSvnSettingLabel=Default SVN settings
PropertiesWizardPage.Author=Author
PropertiesWizardPage.Locker=Locker
PropertiesWizardPage.Description=Description

View File

@@ -82,7 +82,7 @@ import org.talend.core.model.repository.RepositoryContentManager;
import org.talend.core.model.repository.RepositoryManager;
import org.talend.core.model.repository.RepositoryNodeProviderRegistryReader;
import org.talend.core.model.repository.RepositoryViewObject;
import org.talend.core.model.repository.SVNConstant;
import org.talend.core.model.repository.GITConstant;
import org.talend.core.repository.i18n.Messages;
import org.talend.core.repository.model.repositoryObject.MetadataColumnRepositoryObject;
import org.talend.core.repository.model.repositoryObject.MetadataTableRepositoryObject;
@@ -2189,8 +2189,8 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
String branch = ProjectManager.getInstance().getMainProjectBranch(project);
if ("".equals(branch) || branch == null) { //$NON-NLS-1$
branch = null;
} else if (!branch.contains(SVNConstant.NAME_TRUNK) && !branch.contains(SVNConstant.NAME_BRANCHES)
&& !branch.contains(SVNConstant.NAME_TAGS)) {
} else if (!branch.contains(GITConstant.NAME_TRUNK) && !branch.contains(GITConstant.NAME_BRANCHES)
&& !branch.contains(GITConstant.NAME_TAGS)) {
branch = null;
}
urlBranch = branch;

View File

@@ -2180,7 +2180,8 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
ProjectManager.getInstance().getUpdatedRemoteHandlerRecords().clear();
ReferenceProjectProvider.clearTacReferenceList();
ReferenceProjectProblemManager.getInstance().clearAll();
this.repositoryFactoryFromProvider.beforeLogon(monitor, project);
currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
this.repositoryFactoryFromProvider.beforeLogon(currentMonitor, project);
ProjectManager.getInstance().getBeforeLogonRecords().clear();
ProjectManager.getInstance().getUpdatedRemoteHandlerRecords().clear();
ILibrariesService librariesService = getLibrariesService();
@@ -2204,6 +2205,19 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
ExceptionHandler.process(e);
}
// need to set m2
LoginTaskRegistryReader loginTaskRegistryReader = new LoginTaskRegistryReader();
ILoginTask[] allLoginTasks = loginTaskRegistryReader.getAllCommandlineTaskListInstance();
for (ILoginTask task : allLoginTasks) {
if (task.getClass().getCanonicalName().endsWith("M2eUserSettingForTalendLoginTask")) {
try {
task.execute(new NullProgressMonitor());
} catch (Exception e) {
ExceptionHandler.process(e);
}
}
}
ICoreService coreService = getCoreService();
if (coreService != null) {
currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
@@ -2294,9 +2308,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
IRunProcessService runProcessService = getRunProcessService();
if (runProcessService != null) {
runProcessService.initMavenJavaProject(monitor, project);
// before afterLogon migration execute, check and update daikon dependency
runProcessService.checkAndUpdateDaikonDependencies();
}
currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);

View File

@@ -1,36 +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.repository.svn;
import org.talend.repository.ui.actions.AContextualAction;
/**
* created by wchen on 2014-4-1 Detailled comment
*
*/
public abstract class SvnCommitHook extends AContextualAction {
private static boolean activeAutoCommit = false;
public static boolean isActiveAutoCommit() {
return activeAutoCommit;
}
public static void activeAutoCommit() {
activeAutoCommit = true;
}
public static void desactAutoCommit() {
activeAutoCommit = false;
}
}

View File

@@ -1,28 +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.repository.svn;
import java.util.Collection;
import org.eclipse.core.runtime.IPath;
/**
* created by wchen on 2013-10-30 Detailled comment
*
*/
public interface SvnHook {
public void unloadAndRemoveResources(Collection<String> changedPaths);
public Boolean accept(IPath projectRelativePath);
}

View File

@@ -111,7 +111,7 @@ public class CreateFolderAction extends AContextualAction {
|| property.equals(ERepositoryObjectType.JOB_DOC) || property.equals(ERepositoryObjectType.JOBLET_DOC)
|| ERepositoryObjectType.SQLPATTERNS.equals(property)
|| ERepositoryObjectType.REFERENCED_PROJECTS.equals(property)
|| ERepositoryObjectType.SVN_ROOT.equals(property) || ERepositoryObjectType.ROUTINESJAR.equals(property)
|| ERepositoryObjectType.ROUTINESJAR.equals(property)
|| property.equals(ERepositoryObjectType.BEANSJAR)) {
canWork = false;
} else if (property != null

View File

@@ -200,7 +200,7 @@ public class RepositoryDropAdapter extends PluginDropAdapter {
}
}
};
repositoryWorkUnit.setAvoidSvnUpdate(true);
repositoryWorkUnit.setAvoidUpdate(true);
repositoryWorkUnit.setAvoidUnloadResources(true);
ProxyRepositoryFactory.getInstance().executeRepositoryWorkUnit(repositoryWorkUnit);
}

View File

@@ -2,10 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Core Runtime Plug-in
Bundle-SymbolicName: org.talend.core.runtime;singleton:=true
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.0.1.M12
Bundle-Localization: plugin
Bundle-Vendor: .Talend SA.
Export-Package: org.talend.commons.utils.generation,
Export-Package: org.talend.analysistask,
org.talend.commons.utils.generation,
org.talend.commons.utils.io,
org.talend.commons.utils.workbench.resources,
org.talend.core,

View File

@@ -20,6 +20,7 @@
<extension-point id="artifact_handler" name="Artifact Repository Handler" schema="schema/artifact_handler.exsd"/>
<extension-point id="actionFilterDelegate" name="Action Filter delegate" schema="schema/actionFilterDelegate.exsd"/>
<extension-point id="saveItemContextLinkService" name="Save Item Context Link Service" schema="schema/saveItemContextLinkService.exsd"/>
<extension-point id="analysisTask" name="analysisTask" schema="schema/analysisTask.exsd"/>
<extension
point="org.talend.core.runtime.repositoryComponent_provider">

View File

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

View File

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

View File

@@ -0,0 +1,99 @@
// ============================================================================
//
// 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.analysistask;
import java.util.List;
import java.util.Set;
import org.talend.core.model.properties.Item;
import org.talend.core.model.properties.JobletProcessItem;
import org.talend.core.model.properties.ProcessItem;
import org.talend.core.model.repository.ERepositoryObjectType;
import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
/**
* DOC jding class global comment. Detailled comment
*/
public abstract class AbstractItemAnalysisTask implements IItemAnalysisTask {
private String id;
private String name;
private String description = "";
private String detailLink = "";
public abstract Set<ERepositoryObjectType> getRepositoryObjectTypeScope();
public abstract List<AnalysisReportRecorder> execute(Item item);
protected ProcessType getProcessType(Item item) {
ProcessType processType = null;
if (item instanceof ProcessItem) {
processType = ((ProcessItem) item).getProcess();
}
if (item instanceof JobletProcessItem) {
processType = ((JobletProcessItem) item).getJobletProcess();
}
return processType;
}
protected ElementParameterType getElementParameterByName(NodeType node, String name) {
for (Object o : node.getElementParameter()) {
if (o instanceof ElementParameterType) {
ElementParameterType element = (ElementParameterType) o;
if (element.getName().equals(name)) {
return element;
}
}
}
return null;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public String getDetailLink() {
return detailLink;
}
public void setDetailLink(String detailLink) {
this.detailLink = detailLink;
}
}

View File

@@ -0,0 +1,91 @@
// ============================================================================
//
// 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.analysistask;
import org.apache.commons.lang.StringUtils;
import org.talend.commons.report.ItemReportRecorder;
import org.talend.core.model.properties.Item;
/**
* DOC jding class global comment. Detailled comment
*/
public class AnalysisReportRecorder extends ItemReportRecorder {
private IItemAnalysisTask task;
private SeverityOption severity;
public AnalysisReportRecorder(IItemAnalysisTask task, Item item, SeverityOption severity, String detailMessage) {
super();
this.task = task;
this.item = item;
this.severity = severity;
this.detailMessage = detailMessage;
}
public String getTaskName() {
return task.getName();
}
public String getTaskDescription() {
String description = "";
if (StringUtils.isNotBlank(task.getDescription())) {
description = task.getDescription();
}
return description;
}
public String getLinkToDetail() {
return task.getDetailLink();
}
public IItemAnalysisTask getTask() {
return task;
}
public void setTask(IItemAnalysisTask task) {
this.task = task;
}
public SeverityOption getSeverity() {
return severity;
}
public void setSeverity(SeverityOption severity) {
this.severity = severity;
}
public enum SeverityOption {
CRITICAL("Critical", 1),
MAJOR("Major", 2),
WARNING("Warning", 3);
private String label;
private int priority;
private SeverityOption(String label, int priority) {
this.label = label;
this.priority = priority;
}
public String getLabel() {
return label;
}
public int getPriority() {
return priority;
}
}
}

View File

@@ -0,0 +1,46 @@
// ============================================================================
//
// 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.analysistask;
import java.util.List;
import java.util.Set;
import org.talend.core.model.properties.Item;
import org.talend.core.model.repository.ERepositoryObjectType;
/**
* DOC jding class global comment. Detailled comment
*/
public interface IItemAnalysisTask {
Set<ERepositoryObjectType> getRepositoryObjectTypeScope();
List<AnalysisReportRecorder> execute(Item item);
String getId();
void setId(String id);
String getName();
void setName(String name);
String getDescription();
void setDescription(String description);
String getDetailLink();
void setDetailLink(String detailLink);
}

View File

@@ -0,0 +1,266 @@
// ============================================================================
//
// 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.analysistask;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.widgets.WidgetFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.commons.report.ItemsReportUtil;
import org.talend.commons.utils.io.FilesUtils;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.model.general.Project;
import org.talend.core.model.properties.Item;
import org.talend.core.model.repository.ERepositoryObjectType;
import org.talend.core.model.repository.IRepositoryViewObject;
import org.talend.core.runtime.i18n.Messages;
import org.talend.repository.ProjectManager;
import org.talend.repository.model.IProxyRepositoryFactory;
import org.talend.repository.model.IRepositoryService;
/**
* DOC jding class global comment. Detailled comment
*/
public class ItemAnalysisReportManager {
private static final String COMMA = ",";
private static final String ANALYSIS_REPORT_HEAD = "Task name,Task description,Link to details,Severity,Item type,Path to item,Details";
public static final ItemAnalysisReportManager INSTANCE = new ItemAnalysisReportManager();
public static ItemAnalysisReportManager getInstance() {
return INSTANCE;
}
private AtomicBoolean inGenerating = new AtomicBoolean(false);
public List<AnalysisReportRecorder> executeAnalysisTask(Project project) {
IRepositoryService service = (IRepositoryService) GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
IProxyRepositoryFactory repFactory = service.getProxyRepositoryFactory();
List<AnalysisReportRecorder> analysisResultList = new ArrayList<AnalysisReportRecorder>();
List<IItemAnalysisTask> analysisTasks = ItemAnalysisTaskRegistryReader.getInstance().getItemAnalysisTasks();
Set<ERepositoryObjectType> types = new HashSet<ERepositoryObjectType>();
analysisTasks.forEach(task -> {
Set<ERepositoryObjectType> typeScope = task.getRepositoryObjectTypeScope();
if (typeScope != null && !typeScope.isEmpty()) {
types.addAll(typeScope);
}
});
try {
for (ERepositoryObjectType type : types) {
if (!type.isResourceItem()) {
continue;
}
List<IRepositoryViewObject> objects = repFactory.getAll(project, type, true, true);
for (IRepositoryViewObject object : objects) {
Item item = object.getProperty().getItem();
for (IItemAnalysisTask analysisTask : analysisTasks) {
try {
List<AnalysisReportRecorder> recorder = analysisTask.execute(item);
if (recorder != null && !recorder.isEmpty()) {
analysisResultList.addAll(recorder);
}
} catch (Exception e) {
ExceptionHandler.process(e);
}
}
}
}
} catch (Exception e) {
ExceptionHandler.process(e);
}
return analysisResultList;
}
public void generateAnalysisReport(String projectTecName) {
if (isAnalysisReportInGenerating()) {
Display.getDefault().asyncExec(() -> {
MessageDialog.openWarning(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
Messages.getString("ItemAnalysisReportManager.Warning.title"),
Messages.getString("ItemAnalysisReportManager.Warning.message"));
});
return;
}
setAnalysisReportGenerating(true);
Job job = new Job("Generating analysis report") {
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
Project project = ProjectManager.getInstance().getProjectFromProjectTechLabel(projectTecName);
List<AnalysisReportRecorder> analysisReportRecorders = executeAnalysisTask(project);
if (analysisReportRecorders == null || analysisReportRecorders.isEmpty()) {
Display.getDefault().syncExec(() -> {
MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
Messages.getString("ItemAnalysisReportManager.Information.title"),
Messages.getString("ItemAnalysisReportManager.Information.message"));
});
return Status.OK_STATUS;
}
Collections.sort(analysisReportRecorders, (recorder1, recorder2) -> {
return recorder1.getSeverity().getPriority() - recorder2.getSeverity().getPriority();
});
List<String> recordLines = new ArrayList<String>();
for (AnalysisReportRecorder record : analysisReportRecorders) {
StringBuffer buffer = new StringBuffer();
buffer.append(ItemsReportUtil.handleColumnQuotes(record.getTaskName())).append(COMMA);
buffer.append(ItemsReportUtil.handleColumnQuotes(record.getTaskDescription())).append(COMMA);
buffer.append(ItemsReportUtil.handleColumnQuotes(record.getLinkToDetail())).append(COMMA);
buffer.append(ItemsReportUtil.handleColumnQuotes(record.getSeverity().getLabel())).append(COMMA);
buffer.append(ItemsReportUtil.handleColumnQuotes(record.getItemType())).append(COMMA);
buffer.append(ItemsReportUtil.handleColumnQuotes(record.getItemPath())).append(COMMA);
buffer.append(ItemsReportUtil.handleColumnQuotes(record.getDetailMessage()));
recordLines.add(buffer.toString());
}
String currentTimeString = ItemsReportUtil.getCurrentTimeString();
String folderName = "analysisReport" + "_" + currentTimeString;
String fileName = currentTimeString + "_" + projectTecName + "_Analysis_Report.csv";
String filePath = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString() + "/report/" + folderName
+ "/" + fileName;
File reportFile = new File(filePath);
boolean generateSuccess = ItemsReportUtil.generateReportFile(reportFile, ANALYSIS_REPORT_HEAD, recordLines);
if (generateSuccess) {
Display.getDefault().asyncExec(() -> {
AnalysisReportAccessDialog accessDialog = new AnalysisReportAccessDialog(
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
reportFile.getAbsolutePath());
accessDialog.open();
});
}
} catch (Exception e) {
ExceptionHandler.process(e);
} finally {
setAnalysisReportGenerating(false);
}
return Status.OK_STATUS;
}
};
job.setUser(false);
job.setPriority(Job.INTERACTIVE);
job.schedule();
}
public boolean isAnalysisReportInGenerating() {
return inGenerating.get();
}
private void setAnalysisReportGenerating(boolean newValue) {
inGenerating.set(newValue);
}
}
class AnalysisReportAccessDialog extends Dialog {
private String reportGeneratedFile;
protected AnalysisReportAccessDialog(Shell parentShell, String reportGeneratedFile) {
super(parentShell);
this.reportGeneratedFile = reportGeneratedFile;
}
@Override
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
newShell.setText(Messages.getString("AnalysisReportAccessDialog.shellTitle"));
}
@Override
protected void initializeBounds() {
getShell().setSize(700, 190);
Point location = getInitialLocation(getShell().getSize());
getShell().setLocation(location.x, location.y);
}
@Override
protected Control createDialogArea(Composite parent) {
GridLayout layout = new GridLayout();
layout.marginWidth = 0;
layout.marginHeight = 0;
Composite container = WidgetFactory.composite(SWT.NONE).layout(layout).layoutData(new GridData(GridData.FILL_BOTH))
.create(parent);
applyDialogFont(container);
Composite composite = new Composite(container, SWT.NONE);
GridLayout compositeLayout = new GridLayout();
compositeLayout.numColumns = 1;
compositeLayout.marginWidth = 0;
compositeLayout.marginTop = 8;
compositeLayout.marginLeft = 10;
composite.setLayout(compositeLayout);
Label successMsgLabel = new Label(composite, SWT.NONE);
successMsgLabel.setText(Messages.getString("AnalysisReportAccessDialog.generateSuccess"));
GridData gridData = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_VERTICAL);
successMsgLabel.setLayoutData(gridData);
Link accessLink = new Link(composite, SWT.NONE);
accessLink.setText(Messages.getString("AnalysisReportAccessDialog.completeReportAvailable") + " <a>"
+ Messages.getString("AnalysisReportAccessDialog.accessReport") + "</a> ");
accessLink.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_VERTICAL));
accessLink.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
File reportFile = new File(reportGeneratedFile);
if (reportFile != null && reportFile.exists()) {
try {
FilesUtils.selectFileInSystemExplorer(reportFile);
} catch (Exception excep) {
ExceptionHandler.process(excep);
}
}
}
});
return container;
}
@Override
protected void createButtonsForButtonBar(Composite parent) {
createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
}
}

View File

@@ -0,0 +1,84 @@
// ============================================================================
//
// 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.analysistask;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.SafeRunner;
import org.osgi.framework.FrameworkUtil;
import org.talend.core.model.relationship.RelationshipRegistryReader;
import org.talend.core.utils.RegistryReader;
/**
* DOC jding class global comment. Detailled comment
*/
public class ItemAnalysisTaskRegistryReader extends RegistryReader {
private Map<String, IItemAnalysisTask> idItemAnalysisTaskMap = new HashMap<String, IItemAnalysisTask>();
private static final ItemAnalysisTaskRegistryReader INSTANCE = new ItemAnalysisTaskRegistryReader();
public static ItemAnalysisTaskRegistryReader getInstance() {
return INSTANCE;
}
private ItemAnalysisTaskRegistryReader() {
super(FrameworkUtil.getBundle(RelationshipRegistryReader.class).getSymbolicName(), "analysisTask");
init();
}
private synchronized void init() {
idItemAnalysisTaskMap.clear();
readRegistry();
}
public List<IItemAnalysisTask> getItemAnalysisTasks() {
if (idItemAnalysisTaskMap.isEmpty()) {
init();
}
List<IItemAnalysisTask> taskList = new ArrayList<IItemAnalysisTask>();
taskList.addAll(idItemAnalysisTaskMap.values());
return taskList;
}
@Override
protected boolean readElement(IConfigurationElement element) {
if ("analysisTask".equals(element.getName())) {
SafeRunner.run(new RegistryReader.RegistrySafeRunnable() {
@Override
public void run() throws Exception {
IItemAnalysisTask analysisTask = (IItemAnalysisTask) element.createExecutableExtension("class");
String id = element.getAttribute("id");
analysisTask.setId(id);
analysisTask.setName(element.getAttribute("name"));
analysisTask.setDescription(element.getAttribute("description"));
analysisTask.setDetailLink(element.getAttribute("detailLink"));
idItemAnalysisTaskMap.put(id, analysisTask);
}
});
return true;
}
return false;
}
public synchronized void clearCache() {
idItemAnalysisTaskMap.clear();
}
}

View File

@@ -0,0 +1,159 @@
// ============================================================================
//
// 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.commons.report;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.commons.exception.PersistenceException;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.model.properties.Item;
import org.talend.core.model.properties.Property;
import org.talend.core.model.repository.ERepositoryObjectType;
import org.talend.core.ui.ITestContainerCoreService;
import org.talend.repository.model.IRepositoryService;
/**
* DOC jding class global comment. Detailled comment
*/
public class ItemReportRecorder {
protected Item item;
protected String detailMessage;
public String getItemType() {
String type = "";
ERepositoryObjectType itemType = ERepositoryObjectType.getItemType(item);
if (itemType != null) {
if (ERepositoryObjectType.getAllTypesOfTestContainer().contains(itemType)) {
Item parentJobItem = getTestCaseParentJobItem(item);
if (parentJobItem != null) {
ERepositoryObjectType parentJobType = ERepositoryObjectType.getItemType(parentJobItem);
if (parentJobType != null) {
String parentTypePath = getCompleteObjectTypePath(parentJobType);
if (StringUtils.isNotBlank(parentTypePath)) {
type = parentTypePath + "/";
}
}
}
type += itemType;
} else {
type = getCompleteObjectTypePath(itemType);
}
}
return type;
}
public String getItemPath() {
String path = "";
StringBuffer buffer = new StringBuffer();
ERepositoryObjectType itemType = ERepositoryObjectType.getItemType(item);
if (ERepositoryObjectType.getAllTypesOfTestContainer().contains(itemType)) {
StringBuffer testcaseBuffer = new StringBuffer();
Item parentJobItem = getTestCaseParentJobItem(item);
if (parentJobItem != null) {
if (parentJobItem.getState() != null && StringUtils.isNotBlank(parentJobItem.getState().getPath())) {
testcaseBuffer.append(parentJobItem.getState().getPath()).append("/");
}
testcaseBuffer.append(parentJobItem.getProperty() != null ? parentJobItem.getProperty().getLabel() : "");
if (StringUtils.isNotBlank(testcaseBuffer.toString())) {
buffer.append(testcaseBuffer.toString()).append("/");
}
}
} else {
if (item.getState() != null && StringUtils.isNotBlank(item.getState().getPath())) {
buffer.append(item.getState().getPath()).append("/");
}
}
Property property = item.getProperty();
if (property != null) {
buffer.append(property.getLabel() + "_" + property.getVersion());
}
path = buffer.toString();
return path;
}
private Item getTestCaseParentJobItem(Item testcaseItem) {
Item parentJobItem = null;
if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerCoreService.class)) {
ITestContainerCoreService testcaseService = GlobalServiceRegister.getDefault()
.getService(ITestContainerCoreService.class);
if (testcaseService != null) {
try {
parentJobItem = testcaseService.getParentJobItem(item);
} catch (PersistenceException e) {
ExceptionHandler.process(e);
}
}
}
return parentJobItem;
}
private String getCompleteObjectTypePath(ERepositoryObjectType itemType) {
ERepositoryObjectType rootItemType = itemType;
if (ERepositoryObjectType.JDBC != null && ERepositoryObjectType.JDBC.equals(rootItemType)) {
rootItemType = ERepositoryObjectType.METADATA_CONNECTIONS;
}
List<String> typeLabels = new ArrayList<String>();
findOutCompleteTypePath(rootItemType, typeLabels);
if (ERepositoryObjectType.PROCESS != null && ERepositoryObjectType.PROCESS.equals(rootItemType)) {
IRepositoryService repositoryService = IRepositoryService.get();
if (repositoryService != null) {
String standardNodeLabel = repositoryService.getStandardNodeLabel();
if (StringUtils.isNotBlank(standardNodeLabel)) {
typeLabels.add(standardNodeLabel);
}
}
}
StringBuffer buffer = new StringBuffer();
if (!typeLabels.isEmpty()) {
for (int i = 0; i < typeLabels.size(); i++) {
if (i != 0) {
buffer.append("/");
}
buffer.append(typeLabels.get(i));
}
}
return buffer.toString();
}
private void findOutCompleteTypePath(ERepositoryObjectType type, List<String> typeLabels) {
ERepositoryObjectType parentType = ERepositoryObjectType.findParentType(type);
if (parentType != null) {
findOutCompleteTypePath(parentType, typeLabels);
}
typeLabels.add(type.getLabel());
}
public Item getItem() {
return item;
}
public void setItem(Item item) {
this.item = item;
}
public String getDetailMessage() {
return detailMessage;
}
public void setDetailMessage(String detailMessage) {
this.detailMessage = detailMessage;
}
}

View File

@@ -0,0 +1,81 @@
// ============================================================================
//
// 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.commons.report;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.eclipse.core.runtime.Path;
import org.talend.core.utils.TalendQuoteUtils;
/**
* DOC jding class global comment. Detailled comment
*/
public class ItemsReportUtil {
public static boolean generateReportFile(File reportFile, String header, List<String> records) throws Exception {
boolean generateDone = false;
BufferedWriter printWriter = null;
try {
File parentFolder = new Path(reportFile.getAbsolutePath()).removeLastSegments(1).toFile();
// File parentFolder = new File(parentPath);
if (!parentFolder.exists()) {
parentFolder.mkdirs();
}
if (!reportFile.exists()) {
reportFile.createNewFile();
}
FileOutputStream fos = new FileOutputStream(reportFile);
fos.write(new byte[] { (byte) 0xEF, (byte) 0xBB, (byte) 0xBF });
OutputStreamWriter outputWriter = new OutputStreamWriter(fos, "UTF-8");
printWriter = new BufferedWriter(outputWriter);
printWriter.write(header);
printWriter.newLine();
for (String recordStr : records) {
printWriter.write(recordStr);
printWriter.newLine();
}
printWriter.flush();
generateDone = true;
} finally {
if (printWriter != null) {
printWriter.close();
}
}
return generateDone;
}
public static String handleColumnQuotes(String text) {
String quoteMark = TalendQuoteUtils.QUOTATION_MARK;
text = StringUtils.isBlank(text) ? "" : text;
if (text.contains(quoteMark)) {
// replace to double quote surround
text = text.replace(quoteMark, quoteMark + quoteMark);
}
return quoteMark + text + quoteMark;
}
public static String getCurrentTimeString() {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
String time = dateFormat.format(new Date());
return time;
}
}

View File

@@ -73,7 +73,7 @@ import org.talend.commons.utils.encoding.CharsetToolkit;
import org.talend.commons.utils.network.NetworkUtil;
import org.talend.commons.utils.system.EnvironmentUtils;
import org.talend.core.model.metadata.builder.connection.FileConnection;
import org.talend.core.model.repository.SVNConstant;
import org.talend.core.model.repository.GITConstant;
import org.talend.utils.xml.XmlUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -912,7 +912,7 @@ public class FilesUtils {
tarpath.mkdir();
File[] dir = source.listFiles();
for (File element : dir) {
if (element.getName().equals(SVNConstant.SVN_FOLDER)) {
if (element.getName().equals(GITConstant.SVN_FOLDER)) {
continue;
}
copyDirectoryWithoutSvnFolder(element, tarpath);

View File

@@ -39,6 +39,8 @@ public interface ILibraryManagerService extends IService {
* @return
*/
public boolean isInitialized();
public void setInitialized(boolean init);
public void installModules(Collection<ModuleNeeded> modules, IProgressMonitor monitorWrap);

View File

@@ -1,25 +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;
/**
* DOC zwzhao class global comment. Detailled comment
*/
public interface ISVNProviderServiceInCoreRuntime extends IService {
public boolean isInSvn(String filePath);
public boolean doUpdateAndCommit(String filePath);
public void createFolderAndLinkToSvn(String filePath);
}

View File

@@ -66,8 +66,6 @@ public class PluginChecker {
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$
public static final String CORE_TIS_PLUGIN_ID = "org.talend.core.tis"; //$NON-NLS-1$
@@ -285,10 +283,6 @@ public class PluginChecker {
return isPluginLoaded(REMOTE_PROVIDER_PLUGIN_ID);
}
public static boolean isSVNProviderPluginLoaded() {
return isPluginLoaded(SVN_PROVIDER_PLUGIN_ID);
}
public static boolean isGITProviderPluginLoaded() {
return isPluginLoaded(GIT_PROVIDER_PLUGIN_ID);
}

View File

@@ -218,6 +218,8 @@ public class ConnParameterKeys {
* HBase keys.
*/
public static final String CONN_PARA_KEY_HBASE_DISTRIBUTION = "CONN_PARA_KEY_HBASE_DISTRIBUTION"; //$NON-NLS-1$
public static final String CONN_PARA_KEY_HBASE_API_VERSION = "CONN_PARA_KEY_HBASE_API_VERSION"; //$NON-NLS-1$
public static final String CONN_PARA_KEY_HBASE_VERSION = "CONN_PARA_KEY_HBASE_VERSION"; //$NON-NLS-1$

View File

@@ -33,7 +33,7 @@ public enum EDatabaseConnTemplate {
MYSQL(new DbConnStr(EDatabaseTypeName.MYSQL, //
"jdbc:mysql://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
"3306", //$NON-NLS-1$
"noDatetimeStringSync=true")), //$NON-NLS-1$
"noDatetimeStringSync=true&enabledTLSProtocols=TLSv1.2,TLSv1.1,TLSv1")), //$NON-NLS-1$
AMAZON_AURORA(new DbConnStr(EDatabaseTypeName.AMAZON_AURORA, //
"jdbc:mysql://<host>:<port>/<sid>?<property>", //$NON-NLS-1$

View File

@@ -77,7 +77,7 @@ public enum EDatabaseVersion4Drivers {
SAPHana(new DbVersion4Drivers(EDatabaseTypeName.SAPHana, "HDB 1.0", "HDB_1_0", "ngdbc.jar")), //$NON-NLS-1$
// MYSQL, add for 9594
MYSQL_8(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 8", "MYSQL_8", "mysql-connector-java-8.0.18.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
MYSQL_5(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 5", "MYSQL_5", "mysql-connector-java-5.1.30-bin.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
MYSQL_5(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 5", "MYSQL_5", "mysql-connector-java-5.1.49.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
MARIADB(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MariaDB", "MARIADB", "mariadb-java-client-2.5.3.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
// add for 9594
MSSQL(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,"Open source JTDS", "JTDS", "jtds-1.3.1-patch-20190523.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -170,11 +170,11 @@ public enum EDatabaseVersion4Drivers {
REDSHIFT(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT, "redshift", "REDSHIFT", //$NON-NLS-1$ //$NON-NLS-2$
"redshift-jdbc42-no-awssdk-1.2.37.1061.jar")), //$NON-NLS-1$
REDSHIFT_SSO(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT_SSO, "redshift sso", "REDSHIFT_SSO", //$NON-NLS-1$ //$NON-NLS-2$
new String[] { "redshift-jdbc42-no-awssdk-1.2.37.1061.jar", "aws-java-sdk-1.11.848.jar", "jackson-core-2.10.1.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"jackson-databind-2.10.1.jar", "jackson-annotations-2.10.1.jar", "httpcore-4.4.11.jar", "httpclient-4.5.9.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
"joda-time-2.8.1.jar", "commons-logging-1.2.jar", "commons-codec-1.11.jar" })), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
new String[] { "redshift-jdbc42-no-awssdk-1.2.37.1061.jar", "aws-java-sdk-1.11.848.jar", "jackson-core-2.11.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"jackson-databind-2.11.4.jar", "jackson-annotations-2.11.4.jar", "httpcore-4.4.13.jar", "httpclient-4.5.13.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
"joda-time-2.8.1.jar", "commons-logging-1.2.jar", "commons-codec-1.14.jar" })), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
AMAZON_AURORA(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "mysql-connector-java-5.1.30-bin.jar")); //$NON-NLS-1$
AMAZON_AURORA(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "mysql-connector-java-5.1.49.jar")); //$NON-NLS-1$
private DbVersion4Drivers dbVersionBean;

View File

@@ -19,10 +19,6 @@ package org.talend.core.hadoop;
@SuppressWarnings("nls")
public class HadoopConstants {
public static final String SPARK_LOCAL_MODE = "SPARK_LOCAL_MODE";
public static final String SPARK_LOCAL_VERSION = "SPARK_LOCAL_VERSION";
public static final String SPARK_MODE = "SPARK_MODE";
public static final String SPARK_MODE_CLUSTER = "CLUSTER";

View File

@@ -28,8 +28,6 @@ import org.eclipse.emf.ecore.xmi.impl.XMLParserPoolImpl;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.commons.exception.PersistenceException;
import org.talend.commons.runtime.model.emf.EmfHelper;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.ILibraryManagerService;
import org.talend.core.model.component_cache.ComponentCacheFactory;
import org.talend.core.model.component_cache.ComponentCachePackage;
import org.talend.core.model.component_cache.ComponentsCache;
@@ -68,9 +66,6 @@ public class ComponentManager {
ExceptionHandler.process(e);
}
});
ILibraryManagerService repositoryBundleService = GlobalServiceRegister.getDefault()
.getService(ILibraryManagerService.class);
repositoryBundleService.clearCache();
modified.clear();
}
}

View File

@@ -1282,6 +1282,10 @@ public class RepositoryToComponentProperty {
return connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HBASE_VERSION);
}
if (value.equals("HBASE_API_VERSION")) {
return connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HBASE_API_VERSION);
}
if (value.equals("SET_TABLE_NS_MAPPING")) {
return Boolean.valueOf(connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HBASE_SET_TABLE_NS_MAPPING));
}

View File

@@ -16,8 +16,8 @@ package org.talend.core.model.metadata.designerproperties;
* DOC talend class global comment. Detailled comment
*/
public enum SapJcoVersion {
SAP2("sap jco 2.*", "sapjco.jar"), //$NON-NLS-1$
SAP3("sap jco 3.*", "sapjco3.jar");//$NON-NLS-1$
SAP2("sap jco 2.*", "sapjco.jar"), //$NON-NLS-1$ //$NON-NLS-2$
SAP3("sap jco 3.*", "com.sap.conn.jco.sapjco.jar");//$NON-NLS-1$ //$NON-NLS-2$
private String displayName;

View File

@@ -31,7 +31,6 @@ public enum EComponentCategory {
VERSIONS(Messages.getString("EComponentCategory_version"), 9), //$NON-NLS-1$
DEPLOYMENT(Messages.getString("EComponentCategory_deployment"), 9), //$NON-NLS-1$
HEADERFOOTER(Messages.getString("EComponentCategory_headerFooter"), 9), //$NON-NLS-1$
SVNHISTORY(Messages.getString("EComponentCategory_svnHistory"), 9), //$NON-NLS-1$
GITHISTORY(Messages.getString("EComponentCategory_gitHistory"), 9), //$NON-NLS-1$
LOGS(Messages.getString("EComponentCategory_logs"), 6), //$NON-NLS-1$
STATSANDLOGS(Messages.getString("EComponentCategory_statsAndLogs"), 7), //$NON-NLS-1$

View File

@@ -104,9 +104,6 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
public final static ERepositoryObjectType GIT_ROOT = new ERepositoryObjectType("repository.gitroot", "", "GIT_ROOT", true, 1,
new String[] { PROD_DI, PROD_DQ }, new String[] {}, false);
public final static ERepositoryObjectType SVN_ROOT = new ERepositoryObjectType("repository.svnroot", "", "SVN_ROOT", true, 1,
new String[] { PROD_DI, PROD_DQ }, new String[] {}, false);
public final static ERepositoryObjectType SNIPPETS = new ERepositoryObjectType("repository.snippets", "code/snippets",
"SNIPPETS", true, 10, new String[] { PROD_DI }, new String[] {}, false);

View File

@@ -15,9 +15,7 @@ package org.talend.core.model.repository;
/**
* ggu class global comment. Detailled comment
*/
public interface SVNConstant {
public static final String SVN = "svn"; //$NON-NLS-1$
public interface GITConstant {
public static final String NAME_TRUNK = "trunk"; //$NON-NLS-1$

View File

@@ -47,7 +47,6 @@ public interface ITalendCorePrefConstants {
/** Last used project. */
public static final String LAST_USED_PROJECT = "lastUSedProject"; //$NON-NLS-1$
public static final String LAST_USED_SVN_BRANCH = "lastUSedSVNBranch"; //$NON-NLS-1$
/** Last used user. */
public static final String LAST_USED_USER = "lastUSedUser"; //$NON-NLS-1$
@@ -165,10 +164,6 @@ public interface ITalendCorePrefConstants {
public static final String TOP_INSTALL_DONE = "top.install.done"; //$NON-NLS-1$
public static final String SVN_UPDATE_INFO_AUTO_CHECK = "PerformancePreferencePage.svn_update_info_auto_check"; //$NON-NLS-1$
public static final String SVN_UPDATE_INFO_AUTO_CHECK_TIME_INTERVAL = "PerformancePreferencePage.svn_update_info_auto_check_time_interval"; //$NON-NLS-1$
public static final String AUTO_REFRESH_LOCKS = "PerformancePreferencePage.auto_refresh_locks"; //$NON-NLS-1$
/**

View File

@@ -1,3 +1,4 @@
AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// Copyright (c) 2005-2010, Talend Inc.\n//\n// This source code has been automatically generated by_{0}\n// / JobDesigner (CodeGenerator version {1})\n// You can find more information about Talend products at www.talend.com.\n// You may distribute this code under the terms of the GNU LGPL license\n// http://www.gnu.org/licenses/lgpl.html).\n//\n// ============================================================================
AbstractBrandingService.routines_license_header_content2014=Copyright (c) 2006-2014, Talend Inc.\n//\n// This source code has been automatically generated by_{0}\n// CodeGenerator version {1}\n// You can find more information about Talend products at www.talend.com.\n// You may distribute this code under the terms of the GNU LGPL license\n// http://www.gnu.org/licenses/lgpl.html).
AbstractComponentsProvider.folderNotExist=Folder {0} does not exist.
@@ -98,7 +99,6 @@ EComponentCategory_properties=Properties
EComponentCategory_rulerAndGrid=Rulers & Grid
EComponentCategory_sqlTemplate=SQL Template
EComponentCategory_statsAndLogs=Stats & Logs
EComponentCategory_svnHistory=SVN History
EComponentCategory_gitHistory=Git History
EComponentCategory_technical=Technical
EComponentCategory_version=Version
@@ -427,7 +427,6 @@ repository.service=Services
repository.query=Query
repository.CDC=CDC
repository.gitroot=GIT
repository.svnroot=SVN
repository.referencedProjects=Referenced project
repository.beans=Beans
repository.snippets=Snippets
@@ -636,11 +635,22 @@ DynamicPlugin.addExtension.empty=ExtensionPoint or Id is empty!
BigDataBasicUtil.loadDynamicDistribution.IDynamicDistributionManager.notFound=Instance of {0} not found
TalendLibsServerManager.connectUserLibraryFailureMessage=The user libraries artifact repository set in administrator cannot connect: Connection to {0} refused
TalendLibsServerManager.cannotGetUserLibraryServer=Cannot get the user library server from remote administrator
MigrationReportAccessDialog.migrateSuccess=Project items were migrated successfully.
MigrationReportAccessDialog.completeReportAvailable=Complete report is available here:
MigrationReportAccessDialog.accessReport=Access to detail report
MigrationReportAccessDialog.provideAnalysisTool=Studio now provides an experimental tool to analyse project, which generate a report containing:
MigrationReportAccessDialog.listOfProblems=- List of problems where manual fixing is needed.
MigrationReportAccessDialog.title=Project items migration
MigrationReportAccessDialog.migrateSuccess=Project items migrated successfully.
MigrationReportAccessDialog.completeReportAvailable=Check the report
MigrationReportAccessDialog.accessReport=here
MigrationReportAccessDialog.provideAnalysisTool=You can run project analysis now to analyze your migrated project. This experimental tool will generate a report containing:
MigrationReportAccessDialog.listOfProblems=- List of items to fix manually.
MigrationReportAccessDialog.listItems=- List of items to check.
MigrationReportAccessDialog.analysisToolCanTrigger="Project analysis" tool can be triggered manually anytime from "project settings/Audit" page.
MigrationReportAccessDialog.doNotShowAnymore=Do not show this dialog for manual imports
MigrationReportAccessDialog.analysisToolCanTrigger=Note: You can also generate an analysis report from the Project Settings > Audit view.
MigrationReportAccessDialog.doNotShowAnymore=Do not show this again
MigrationReportAccessDialog.runAnalysisButton=Run analysis
MigrationReportAccessDialog.notNowButton=Not now
ItemAnalysisReportManager.Information.title=Information
ItemAnalysisReportManager.Information.message=Project analysis completed successfully. No exception records generated.
ItemAnalysisReportManager.Warning.title=Warning
ItemAnalysisReportManager.Warning.message=Can't run a new analysis now. Wait for the current analysis to complete and try again.
AnalysisReportAccessDialog.shellTitle=Project analysis
AnalysisReportAccessDialog.generateSuccess=Project analysis completed successfully.
AnalysisReportAccessDialog.completeReportAvailable=Check the report
AnalysisReportAccessDialog.accessReport=here

View File

@@ -16,6 +16,7 @@ import java.net.URI;
import java.util.Collection;
import java.util.List;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IProgressMonitor;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.IService;
@@ -41,6 +42,10 @@ public interface IStudioLiteP2Service extends IService {
*/
public static final int RESULT_CANCEL = 2;
String getProfileIdForProject(String projTechnicalName, boolean isRemoteProject);
void onProjectDeletion(IProgressMonitor monitor, IProject deletedProj) throws Exception;
void setProfileKey(String profKey) throws Exception;
String getProfileKey() throws Exception;
@@ -73,6 +78,8 @@ public interface IStudioLiteP2Service extends IService {
ValidatePotentialFeaturesHook validatePotentialFeatures(IProgressMonitor monitor, Project proj) throws Exception;
int installRequiredFeatures(IProgressMonitor monitor, ValidateRequiredFeaturesHook hook, Project proj) throws Exception;
/**
* selected features will be write into the required feature list of project
*
@@ -82,7 +89,8 @@ public interface IStudioLiteP2Service extends IService {
* {@link IStudioLiteP2Service#RESULT_SKIP}<br/>
* {@link IStudioLiteP2Service#RESULT_CANCEL}<br/>
*/
int showUpdateProjectRequiredFeaturesWizard(ValidatePotentialFeaturesHook hook, Project proj) throws Exception;
int showUpdateProjectRequiredFeaturesWizard(IProgressMonitor monitor, ValidatePotentialFeaturesHook hook, Project proj)
throws Exception;
int adaptFeaturesForProject(IProgressMonitor monitor, Project proj) throws Exception;

View File

@@ -16,6 +16,7 @@ import java.io.IOException;
import java.net.URL;
import org.eclipse.jface.resource.ImageDescriptor;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.IService;
import org.w3c.dom.Element;
@@ -58,4 +59,13 @@ public interface IBrandingService extends IService {
public String getUserManuals();
public String getRoutineLicenseHeader(String version);
public static IBrandingService get() {
GlobalServiceRegister gsr = GlobalServiceRegister.getDefault();
if (gsr.isServiceRegistered(IBrandingService.class)) {
return gsr.getService(IBrandingService.class);
}
return null;
}
}

View File

@@ -28,9 +28,7 @@ public class RepositoryImageProvider {
public static IImage getIcon(ERepositoryObjectType type) {
if (type == ERepositoryObjectType.SVN_ROOT) {
return ECoreImage.SVN_ROOT_ICON;
} else if (type == ERepositoryObjectType.PROCESS) {
if (type == ERepositoryObjectType.PROCESS) {
return ECoreImage.PROCESS_ICON;
} else if (type == ERepositoryObjectType.JOBLET) {
return ECoreImage.JOBLET_STANDARD_ICON;

View File

@@ -275,6 +275,6 @@ public interface IRunProcessService extends IService {
public void deleteOldVersionTalendJobProject(IRepositoryViewObject object);
public void checkAndUpdateDaikonDependencies();
void updateAllCodeCacheStatus(boolean isUpdated);
}

View File

@@ -29,9 +29,11 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.Shell;
import org.talend.analysistask.ItemAnalysisReportManager;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.commons.utils.io.FilesUtils;
import org.talend.core.runtime.i18n.Messages;
import org.talend.repository.ProjectManager;
/**
* DOC jding class global comment. Detailled comment
@@ -53,12 +55,12 @@ public class MigrationReportAccessDialog extends Dialog {
@Override
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
newShell.setText("Project items migration");
newShell.setText(Messages.getString("MigrationReportAccessDialog.title"));
}
@Override
protected void initializeBounds() {
getShell().setSize(780, 390);
getShell().setSize(890, 350);
Point location = getInitialLocation(getShell().getSize());
getShell().setLocation(location.x, location.y);
}
@@ -84,7 +86,7 @@ public class MigrationReportAccessDialog extends Dialog {
createMessageLabel(migrationInfoArea, Messages.getString("MigrationReportAccessDialog.migrateSuccess"));
Link accessLink = new Link(migrationInfoArea, SWT.NONE);
accessLink.setText(Messages.getString("MigrationReportAccessDialog.completeReportAvailable") + " <a>"
+ Messages.getString("MigrationReportAccessDialog.accessReport") + "</a> ");
+ Messages.getString("MigrationReportAccessDialog.accessReport") + "</a> .");
accessLink.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_VERTICAL));
accessLink.addSelectionListener(new SelectionAdapter() {
@@ -153,20 +155,24 @@ public class MigrationReportAccessDialog extends Dialog {
private Label createMessageLabel(Composite parent, String message) {
Label messageLabel = new Label(parent, SWT.NONE);
messageLabel.setText(message);
GridData gridData = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_VERTICAL);
GridData gridData = new GridData(GridData.GRAB_HORIZONTAL);
messageLabel.setLayoutData(gridData);
return messageLabel;
}
@Override
protected void createButtonsForButtonBar(Composite parent) {
createButton(parent, IDialogConstants.YES_ID, IDialogConstants.YES_LABEL, true);
createButton(parent, IDialogConstants.NO_ID, IDialogConstants.NO_LABEL, true);
createButton(parent, IDialogConstants.YES_ID, Messages.getString("MigrationReportAccessDialog.runAnalysisButton"), true);
createButton(parent, IDialogConstants.NO_ID, Messages.getString("MigrationReportAccessDialog.notNowButton"), true);
}
@Override
protected void buttonPressed(int buttonId) {
setReturnCode(OK);
if (IDialogConstants.YES_ID == buttonId) {
ItemAnalysisReportManager.getInstance()
.generateAnalysisReport(ProjectManager.getInstance().getCurrentProject().getTechnicalLabel());
}
close();
}

View File

@@ -12,13 +12,10 @@
// ============================================================================
package org.talend.migration;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
@@ -37,10 +34,10 @@ import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;
import org.osgi.service.prefs.BackingStoreException;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.commons.report.ItemsReportUtil;
import org.talend.core.PluginChecker;
import org.talend.core.model.properties.Item;
import org.talend.core.model.properties.Property;
import org.talend.core.utils.TalendQuoteUtils;
/**
* DOC jding class global comment. Detailled comment
@@ -77,37 +74,24 @@ public class MigrationReportHelper {
return;
}
BufferedWriter printWriter = null;
File exportFolder = null;
File reportFile = null;
try {
String currentTime = getCurrentTime();
String folderPath = getReportExportFolder(currentTime);
exportFolder = new File(folderPath);
if (!exportFolder.exists()) {
exportFolder.mkdirs();
}
String filePath = folderPath + "/" + getReportFileName(currentTime, projectTecName);
String filePath = getReportExportFolder(currentTime) + "/" + getReportFileName(currentTime, projectTecName);
reportGeneratedPath = filePath;
reportFile = new File(filePath);
reportFile.createNewFile();
FileOutputStream fos = new FileOutputStream(reportFile);
fos.write(new byte[] { (byte) 0xEF, (byte) 0xBB, (byte) 0xBF });
OutputStreamWriter outputWriter = new OutputStreamWriter(fos, "UTF-8");
printWriter = new BufferedWriter(outputWriter);
printWriter.write(MIGRATION_REPORT_HEAD);
printWriter.newLine();
List<String> recordLines = new ArrayList<String>();
for (MigrationReportRecorder record : migrationReportRecorders) {
StringBuffer buffer = new StringBuffer();
buffer.append(handleQuotes(record.getTaskClassName())).append(COMMA);
buffer.append(handleQuotes(record.getTaskDescription())).append(COMMA);
buffer.append(handleQuotes(record.getItemType())).append(COMMA);
buffer.append(handleQuotes(record.getItemPath())).append(COMMA);
buffer.append(handleQuotes(record.getMigrationDetails()));
printWriter.write(buffer.toString());
printWriter.newLine();
buffer.append(ItemsReportUtil.handleColumnQuotes(record.getTaskClassName())).append(COMMA);
buffer.append(ItemsReportUtil.handleColumnQuotes(record.getTaskDescription())).append(COMMA);
buffer.append(ItemsReportUtil.handleColumnQuotes(record.getItemType())).append(COMMA);
buffer.append(ItemsReportUtil.handleColumnQuotes(record.getItemPath())).append(COMMA);
buffer.append(ItemsReportUtil.handleColumnQuotes(record.getDetailMessage()));
recordLines.add(buffer.toString());
}
printWriter.flush();
ItemsReportUtil.generateReportFile(reportFile, MIGRATION_REPORT_HEAD, recordLines);
} catch (Exception e) {
ExceptionHandler.process(e);
if (reportFile != null && reportFile.exists()) {
@@ -117,35 +101,27 @@ public class MigrationReportHelper {
exportFolder.delete();
}
} finally {
try {
if (printWriter != null) {
printWriter.close();
}
} catch (IOException e) {
ExceptionHandler.process(e);
}
migrationReportRecorders.clear();
taskItemRecords.clear();
}
}
private String handleQuotes(String text) {
String quoteMark = TalendQuoteUtils.QUOTATION_MARK;
if (text.contains(quoteMark)) {
// replace to double quote surround
text = text.replace(quoteMark, quoteMark + quoteMark);
}
return quoteMark + text + quoteMark;
}
public boolean isRequireDefaultRecord(IProjectMigrationTask task, Item item) {
boolean require = true;
if (task.getOrder() != null) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(task.getOrder());
int year = calendar.get(Calendar.YEAR);
if (year <= 2016) {
return false;
}
}
if (item.getProperty() != null) {
Property property = item.getProperty();
String key = task.getId() + "_" + property.getId() + "_" + property.getVersion();
if (taskItemRecords.contains(key)) {
require = false;
return false;
}
}
return require;
@@ -169,16 +145,13 @@ public class MigrationReportHelper {
}
public synchronized void checkMigrationReport(boolean onStartUp) {
if (StringUtils.isBlank(reportGeneratedPath) || !PluginChecker.isTIS()) {
if (StringUtils.isBlank(reportGeneratedPath) || !PluginChecker.isTIS() || !onStartUp && isReportDialogDisable()) {
return;
}
File reportFile = new File(reportGeneratedPath);
if (reportFile == null || !reportFile.exists()) {
return;
}
if (!onStartUp && isReportDialogDisable()) {
return;
}
Job job = new Job("Check migration report") {
@Override

View File

@@ -12,34 +12,23 @@
// ============================================================================
package org.talend.migration;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.commons.exception.PersistenceException;
import org.talend.core.GlobalServiceRegister;
import org.talend.commons.report.ItemReportRecorder;
import org.talend.core.model.components.ComponentUtilities;
import org.talend.core.model.properties.Item;
import org.talend.core.model.properties.Property;
import org.talend.core.model.repository.ERepositoryObjectType;
import org.talend.core.ui.ITestContainerCoreService;
import org.talend.core.utils.TalendQuoteUtils;
import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
import org.talend.repository.model.IRepositoryService;
/**
* DOC jding class global comment. Detailled comment
*/
public class MigrationReportRecorder {
public class MigrationReportRecorder extends ItemReportRecorder {
private IProjectMigrationTask task;
private MigrationOperationType operationType;
private Item item;
private NodeType node;
private String paramName;
@@ -48,8 +37,6 @@ public class MigrationReportRecorder {
private String newValue;
private String detailMessage;
public enum MigrationOperationType {
ADD,
MODIFY,
@@ -93,113 +80,7 @@ public class MigrationReportRecorder {
return description;
}
public String getItemType() {
String type = "";
ERepositoryObjectType itemType = ERepositoryObjectType.getItemType(item);
if (itemType != null) {
if (ERepositoryObjectType.getAllTypesOfTestContainer().contains(itemType)) {
Item parentJobItem = getTestCaseParentJobItem(item);
if (parentJobItem != null) {
ERepositoryObjectType parentJobType = ERepositoryObjectType.getItemType(parentJobItem);
if (parentJobType != null) {
String parentTypePath = getCompleteObjectTypePath(parentJobType);
if (StringUtils.isNotBlank(parentTypePath)) {
type = parentTypePath + "/";
}
}
}
type += itemType;
} else {
type = getCompleteObjectTypePath(itemType);
}
}
return type;
}
public String getItemPath() {
String path = "";
StringBuffer buffer = new StringBuffer();
ERepositoryObjectType itemType = ERepositoryObjectType.getItemType(item);
if (ERepositoryObjectType.getAllTypesOfTestContainer().contains(itemType)) {
StringBuffer testcaseBuffer = new StringBuffer();
Item parentJobItem = getTestCaseParentJobItem(item);
if (parentJobItem != null) {
if (parentJobItem.getState() != null && StringUtils.isNotBlank(parentJobItem.getState().getPath())) {
testcaseBuffer.append(parentJobItem.getState().getPath()).append("/");
}
testcaseBuffer.append(parentJobItem.getProperty() != null ? parentJobItem.getProperty().getLabel() : "");
if (StringUtils.isNotBlank(testcaseBuffer.toString())) {
buffer.append(testcaseBuffer.toString()).append("/");
}
}
} else {
if (item.getState() != null && StringUtils.isNotBlank(item.getState().getPath())) {
buffer.append(item.getState().getPath()).append("/");
}
}
Property property = item.getProperty();
if (property != null) {
buffer.append(property.getLabel() + "_" + property.getVersion());
}
path = buffer.toString();
return path;
}
private Item getTestCaseParentJobItem(Item testcaseItem) {
Item parentJobItem = null;
if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerCoreService.class)) {
ITestContainerCoreService testcaseService = GlobalServiceRegister.getDefault()
.getService(ITestContainerCoreService.class);
if (testcaseService != null) {
try {
parentJobItem = testcaseService.getParentJobItem(item);
} catch (PersistenceException e) {
ExceptionHandler.process(e);
}
}
}
return parentJobItem;
}
private String getCompleteObjectTypePath(ERepositoryObjectType itemType) {
ERepositoryObjectType rootItemType = itemType;
if (ERepositoryObjectType.JDBC != null && ERepositoryObjectType.JDBC.equals(rootItemType)) {
rootItemType = ERepositoryObjectType.METADATA_CONNECTIONS;
}
List<String> typeLabels = new ArrayList<String>();
findOutCompleteTypePath(rootItemType, typeLabels);
if (ERepositoryObjectType.PROCESS != null && ERepositoryObjectType.PROCESS.equals(rootItemType)) {
IRepositoryService repositoryService = IRepositoryService.get();
if (repositoryService != null) {
String standardNodeLabel = repositoryService.getStandardNodeLabel();
if (StringUtils.isNotBlank(standardNodeLabel)) {
typeLabels.add(standardNodeLabel);
}
}
}
StringBuffer buffer = new StringBuffer();
if (!typeLabels.isEmpty()) {
for (int i = 0; i < typeLabels.size(); i++) {
if (i != 0) {
buffer.append("/");
}
buffer.append(typeLabels.get(i));
}
}
return buffer.toString();
}
private void findOutCompleteTypePath(ERepositoryObjectType type, List<String> typeLabels) {
ERepositoryObjectType parentType = ERepositoryObjectType.findParentType(type);
if (parentType != null) {
findOutCompleteTypePath(parentType, typeLabels);
}
typeLabels.add(type.getLabel());
}
public String getMigrationDetails() {
public String getDetailMessage() {
String details = detailMessage;
if (StringUtils.isNotBlank(detailMessage)) {
return details;
@@ -277,24 +158,6 @@ public class MigrationReportRecorder {
this.operationType = operationType;
}
/**
* Getter for item.
*
* @return the item
*/
public Item getItem() {
return item;
}
/**
* Sets the item.
*
* @param item the item to set
*/
public void setItem(Item item) {
this.item = item;
}
/**
* Sets the node.
*

View File

@@ -41,7 +41,7 @@ import org.talend.core.model.properties.Property;
import org.talend.core.model.repository.ERepositoryObjectType;
import org.talend.core.model.repository.IRepositoryViewObject;
import org.talend.core.model.repository.RepositoryManager;
import org.talend.core.model.repository.SVNConstant;
import org.talend.core.model.repository.GITConstant;
import org.talend.core.model.utils.TalendPropertiesUtil;
import org.talend.core.runtime.CoreRuntimePlugin;
import org.talend.core.runtime.util.URIHelper;
@@ -63,13 +63,13 @@ public final class ProjectManager {
public static final String UNDER_LINE = "_"; //$NON-NLS-1$
public static final String SEP_CHAR = SVNConstant.SEP_CHAR;
public static final String SEP_CHAR = GITConstant.SEP_CHAR;
public static final String NAME_TRUNK = SVNConstant.NAME_TRUNK;
public static final String NAME_TRUNK = GITConstant.NAME_TRUNK;
public static final String NAME_BRANCHES = SVNConstant.NAME_BRANCHES;
public static final String NAME_BRANCHES = GITConstant.NAME_BRANCHES;
public static final String NAME_TAGS = SVNConstant.NAME_TAGS;
public static final String NAME_TAGS = GITConstant.NAME_TAGS;
public static final String BRANCHES_PREFIX = "branches/";
@@ -94,6 +94,8 @@ public final class ProjectManager {
private Set<Object> updatedRemoteHandlerRecords;
private Set<Project> tempProjects;
private static final Map<String, String> projectLabelWithOriginVersion = new HashMap<String, String> ();
private WeakHashMap<IRepositoryViewObject, Boolean> cachedObjects = new WeakHashMap<IRepositoryViewObject, Boolean>();
@@ -627,8 +629,8 @@ public final class ProjectManager {
*/
if (!branchSelection.contains(NAME_TAGS) && !branchSelection.contains(NAME_BRANCHES)
&& !branchSelection.contains(NAME_TRUNK) && !branchSelection.contains(SVNConstant.NAME_MASTER)
&& !branchSelection.contains(SVNConstant.NAME_MAIN)) {
&& !branchSelection.contains(NAME_TRUNK) && !branchSelection.contains(GITConstant.NAME_MASTER)
&& !branchSelection.contains(GITConstant.NAME_MAIN)) {
branchSelection = NAME_BRANCHES + branchSelection;
}
return branchSelection;
@@ -656,7 +658,7 @@ public final class ProjectManager {
if (fields == null || technicalLabel == null) {
return branchForMainProject;
}
String branchKey = IProxyRepositoryFactory.BRANCH_SELECTION + SVNConstant.UNDER_LINE_CHAR + technicalLabel;
String branchKey = IProxyRepositoryFactory.BRANCH_SELECTION + GITConstant.UNDER_LINE_CHAR + technicalLabel;
if (fields.containsKey(branchKey)) {
branchForMainProject = fields.get(branchKey);
}
@@ -668,12 +670,12 @@ public final class ProjectManager {
public String getFormatedBranchName(String branchName) {
String formatedBranchName = branchName;
if (!branchName.startsWith(SVNConstant.NAME_TAGS + SVNConstant.SEP_CHAR)
&& !branchName.startsWith(SVNConstant.NAME_BRANCHES + SVNConstant.SEP_CHAR)
&& !branchName.startsWith(SVNConstant.NAME_ORIGIN + SVNConstant.SEP_CHAR)
&& !branchName.equals(SVNConstant.NAME_TRUNK) && !branchName.equals(SVNConstant.NAME_MASTER)
&& !branchName.equals(SVNConstant.NAME_MAIN)) {
formatedBranchName = SVNConstant.NAME_BRANCHES + SVNConstant.SEP_CHAR + branchName;
if (!branchName.startsWith(GITConstant.NAME_TAGS + GITConstant.SEP_CHAR)
&& !branchName.startsWith(GITConstant.NAME_BRANCHES + GITConstant.SEP_CHAR)
&& !branchName.startsWith(GITConstant.NAME_ORIGIN + GITConstant.SEP_CHAR)
&& !branchName.equals(GITConstant.NAME_TRUNK) && !branchName.equals(GITConstant.NAME_MASTER)
&& !branchName.equals(GITConstant.NAME_MAIN)) {
formatedBranchName = GITConstant.NAME_BRANCHES + GITConstant.SEP_CHAR + branchName;
}
return formatedBranchName;
}
@@ -723,7 +725,7 @@ public final class ProjectManager {
if (fields == null || technicalLabel == null) {
return;
}
String key = IProxyRepositoryFactory.BRANCH_SELECTION + SVNConstant.UNDER_LINE_CHAR + technicalLabel;
String key = IProxyRepositoryFactory.BRANCH_SELECTION + GITConstant.UNDER_LINE_CHAR + technicalLabel;
// TDI-23291:when branchValue is null,should not set "" to the branchkey.
if (branchValue != null) {
fields.put(key, branchValue);
@@ -735,6 +737,7 @@ public final class ProjectManager {
*/
public void clearAll() {
mapProjectUrlToBranchUrl.clear();
projectLabelWithOriginVersion.clear();
clearFolderCache();
}
@@ -832,4 +835,9 @@ public final class ProjectManager {
}
return null;
}
public Map<String, String> getProjectLabelWithOriginVersion() {
return projectLabelWithOriginVersion;
}
}

View File

@@ -52,7 +52,7 @@ public abstract class RepositoryWorkUnit<T> {
/**
* Usefull for some save only actions, where we're sure everything is up to date.
*/
private boolean avoidSvnUpdate;
private boolean avoidUpdate;
public Object getStartingPoint() {
return startingPoint;
@@ -159,8 +159,8 @@ public abstract class RepositoryWorkUnit<T> {
*
* @return the avoidSvnUpdate
*/
public boolean isAvoidSvnUpdate() {
return this.avoidSvnUpdate;
public boolean isAvoidUpdate() {
return this.avoidUpdate;
}
/**
@@ -168,8 +168,8 @@ public abstract class RepositoryWorkUnit<T> {
*
* @param avoidSvnUpdate the avoidSvnUpdate to set
*/
public void setAvoidSvnUpdate(boolean avoidSvnUpdate) {
this.avoidSvnUpdate = avoidSvnUpdate;
public void setAvoidUpdate(boolean avoidSvnUpdate) {
this.avoidUpdate = avoidSvnUpdate;
}
/**

View File

@@ -140,8 +140,6 @@ public interface IRepositoryService extends IService {
public boolean askRetryForNetworkIssue(Throwable ex);
boolean isSVN();
boolean isGIT();
public void setShouldCheckRepoViewCommonNavigatorDirty(IRepositoryView repView, boolean shouldFlag);

View File

@@ -72,11 +72,6 @@ public class RepositoryConstants {
public static final String FOLDER_PATTERN = "^[a-zA-Z]+[a-zA-Z0-9\\_]*$"; //$NON-NLS-1$
public static final String SVN_POMS_FILE_INCLUDE_PATTERN =
"poms/.*(pom\\.xml|pom-bundle\\.xml|pom-feature\\.xml|pom-microservice\\.xml|pom-control-bundle\\.xml)"; //$NON-NLS-1$
public static final String SVN_POMS_FOLDER_EXCLUDE_PATTERN = "poms/.*(/\\.settings|/src|/target|/tests)"; //$NON-NLS-1$
public static final String REPOSITORY_ITEM_PATTERN_INTERN = "a-zA-Z0-9\\.\\-\\_\\ \\(\\)\\[\\]="; //$NON-NLS-1$
public static final String REPOSITORY_ITEM_PATTERN = "^[" + REPOSITORY_ITEM_PATTERN_INTERN + "]+$"; //$NON-NLS-1$ //$NON-NLS-2$

View File

@@ -293,9 +293,6 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
default:
final ERepositoryObjectType contentType = getContentType();
if (contentType != null) {
if ("SVN".equals(contentType.toString())) {
return getProperties(EProperties.LABEL).toString();
}
if (contentType.equals(ERepositoryObjectType.PROCESS)) {
return getProperties(EProperties.LABEL).toString();
}

View File

@@ -34,8 +34,6 @@ import org.talend.commons.ui.swt.formtools.LabelledText;
import org.talend.commons.utils.io.FilesUtils;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.ILibraryManagerService;
import org.talend.core.ISVNProviderServiceInCoreRuntime;
import org.talend.core.PluginChecker;
import org.talend.core.runtime.i18n.Messages;
/**

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Core UI Plug-in
Bundle-SymbolicName: org.talend.core.ui;singleton:=true
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.0.1.M12
Require-Bundle: org.apache.commons.lang,
org.apache.commons.collections,
org.eclipse.gef;visibility:=reexport,

View File

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

View File

@@ -74,7 +74,6 @@ EComponentCategory_properties=Properties
EComponentCategory_rulerAndGrid=Rulers & Grid
EComponentCategory_sqlTemplate=SQL Template
EComponentCategory_statsAndLogs=Stats & Logs
EComponentCategory_svnHistory=SVN History
EComponentCategory_technical=Technical
EComponentCategory_version=Version
EComponentCategory_headerFooter=Header/Footer
@@ -342,7 +341,6 @@ repository.metadataSalesforceSchema.alias=Salesforce CRM
repository.process=Job Designs
repository.query=Query
repository.CDC=CDC
repository.svnroot=SVN
repository.referencedProjects=Referenced project
repository.routines=Routines
repository.snippets=Snippets

View File

@@ -171,7 +171,7 @@ public abstract class JobEditorInput extends RepositoryEditorInput {
}
};
rwu.setAvoidUnloadResources(true);
rwu.setAvoidSvnUpdate(true);
rwu.setAvoidUpdate(true);
rwu.setAvoidUpdateLocks(true);
factory.executeRepositoryWorkUnit(rwu);
rwu.throwPersistenceExceptionIfAny();

View File

@@ -1,33 +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.ui.services;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
import org.talend.core.IService;
import org.talend.core.model.repository.IRepositoryViewObject;
import org.talend.core.ui.properties.tab.IDynamicProperty;
/**
* DOC ggu class global comment. Detailled comment
*/
public interface ISVNUiProviderService extends IService {
public IDynamicProperty createProcessSVNHistoryComposite(Composite parent, TabbedPropertySheetWidgetFactory factory,
IRepositoryViewObject obj);
public boolean isSVNHistoryComposite(IDynamicProperty dp);
public ISelection getSVNHistorySelection(IDynamicProperty dp);
}

View File

@@ -3,7 +3,7 @@ Automatic-Module-Name: org.talend.core
Bundle-ManifestVersion: 2
Bundle-Name: Core Plug-in
Bundle-SymbolicName: org.talend.core;singleton:=true
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.0.1.M12
Bundle-Activator: org.talend.core.CorePlugin
Bundle-Localization: plugin
Eclipse-LazyStart: true

View File

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

View File

@@ -61,7 +61,6 @@ EComponentCategory_properties=Properties
EComponentCategory_rulerAndGrid=Rulers & Grid
EComponentCategory_sqlTemplate=SQL Template
EComponentCategory_statsAndLogs=Stats & Logs
EComponentCategory_svnHistory=SVN History
EComponentCategory_technical=Technical
EComponentCategory_version=Version
EComponentCategory_headerFooter=Header/Footer

View File

@@ -48,6 +48,8 @@ abstract public class BaseComponentInstallerTask implements IComponentInstallerT
private static final String SYS_PROP_TCOMPV0 = "tcompv0.update";
private static final String SYS_PROP_OVERWRITE = "m2.overwrite";
private static final String SYS_PROP_OVERWRITE_DEFAULT = "false";
private static final String SYS_CUSTOM_MAVEN_REPO = "maven.local.repository";
private int order;
@@ -216,19 +218,27 @@ abstract public class BaseComponentInstallerTask implements IComponentInstallerT
* @return local maven repository path
*/
protected File getM2RepositoryPath() {
String mavenRepo = System.getProperty(SYS_CUSTOM_MAVEN_REPO);
File m2Repo = null;
final IMaven maven = MavenPlugin.getMaven();
try {
maven.reloadSettings();
} catch (CoreException e) {
LOGGER.error("getM2RepositoryPath error", e);
}
String localRepository = maven.getLocalRepositoryPath();
if (!StringUtils.isEmpty(localRepository)) {
m2Repo = new File(localRepository);
}
if (StringUtils.isEmpty(mavenRepo)) {
final IMaven maven = MavenPlugin.getMaven();
try {
maven.reloadSettings();
} catch (CoreException e) {
LOGGER.error("getM2RepositoryPath error", e);
}
String localRepository = maven.getLocalRepositoryPath();
if (!StringUtils.isEmpty(localRepository)) {
m2Repo = new File(localRepository);
}
} else {
m2Repo = new File(mavenRepo);
}
if (m2Repo != null && !m2Repo.exists()) {
m2Repo.mkdirs();
}

View File

@@ -1,40 +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.services;
import org.eclipse.core.resources.IProject;
import org.talend.commons.exception.PersistenceException;
import org.talend.core.IService;
import org.talend.core.model.general.Project;
/**
* nma class global comment. Detailled comment
*/
public interface ISVNProviderService extends IService {
public boolean isProjectInSvnMode();
public String getLastSVNRevision(Object process);
public String getCurrentSVNRevision(Object process);
public String[] getBranchList(Project project);
public boolean isSVNProject(Project p) throws PersistenceException;
public void svnEclipseHandlerDelete(IProject eclipseProject, Project currentProject, String filePath);
public String getProjectUrl(Project project);
public void clean();
}

View File

@@ -107,7 +107,6 @@ import org.talend.core.runtime.repository.build.BuildExportManager;
import org.talend.core.service.IResourcesDependenciesService;
import org.talend.core.services.ICoreTisService;
import org.talend.core.services.IGITProviderService;
import org.talend.core.services.ISVNProviderService;
import org.talend.core.ui.IJobletProviderService;
import org.talend.core.ui.ITestContainerProviderService;
import org.talend.core.utils.BitwiseOptionUtils;
@@ -1821,18 +1820,12 @@ public class ProcessorUtilities {
}
public static boolean isRemoteProject() {
ISVNProviderService svnService = null;
if (PluginChecker.isSVNProviderPluginLoaded()) {
svnService = GlobalServiceRegister.getDefault().getService(ISVNProviderService.class);
}
IGITProviderService gitService = null;
if (PluginChecker.isGITProviderPluginLoaded()) {
gitService = GlobalServiceRegister.getDefault().getService(IGITProviderService.class);
}
if ((svnService != null && svnService.isProjectInSvnMode()) || (gitService != null && gitService.isProjectInGitMode()) ) {
if ((gitService != null && gitService.isProjectInGitMode())) {
return true;
}
@@ -2717,12 +2710,9 @@ public class ProcessorUtilities {
}
public static boolean isCIMode() {
// if it's CI mode , then the system property of maven.local.repository will store the value of studio
// m2 path,otherwise it's null
return System.getProperty("maven.local.repository") != null;
return Boolean.getBoolean("ci.mode");
}
public static void setExportConfig(boolean export) {
setExportConfig(JavaUtils.JAVA_APP_NAME, null, null, export, new Date());
}

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.talend.cwm.mip.edit; singleton:=true
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.0.1.M12
Bundle-ClassPath: .
Bundle-Activator: orgomg.cwm.objectmodel.core.provider.Cwm_mipEditPlugin$Implementation
Bundle-Vendor: %providerName

View File

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

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.talend.cwm.mip.editor; singleton:=true
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.0.1.M12
Bundle-ClassPath: .
Bundle-Activator: orgomg.cwm.objectmodel.core.presentation.Cwm_mipEditorPlugin$Implementation
Bundle-Vendor: %providerName

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.0.1-M12</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.cwm.mip.editor</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.talend.cwm.mip; singleton:=true
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.0.1.M12
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin

View File

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

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Datatools XML Plug-in
Bundle-SymbolicName: org.talend.datatools.xml
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.0.1.M12
Require-Bundle: org.eclipse.xsd,
org.apache.commons.commons-beanutils,
org.apache.commons.lang,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.0.1-M12</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.datatools.xml</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Aether
Bundle-SymbolicName: org.talend.designer.maven.aether
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.0.1.M12
Bundle-Activator: org.talend.designer.maven.aether.Activator
Require-Bundle: org.eclipse.core.runtime,
org.talend.libraries.jackson,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<version>8.0.1-M12</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.maven.aether</artifactId>

View File

@@ -3,7 +3,7 @@ Automatic-Module-Name: org.talend.designer.maven.repo.tck
Bundle-ManifestVersion: 2
Bundle-Name: Maven repo Tck Plug-in
Bundle-SymbolicName: org.talend.designer.maven.repo.tck;singleton:=true
Bundle-Version: 8.0.1.qualifier
Bundle-Version: 8.0.1.M12
Bundle-Localization: plugin
Eclipse-LazyStart: true
Require-Bundle: org.talend.core,

View File

@@ -1,189 +1,190 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.maven.repo.tck</artifactId>
<packaging>eclipse-plugin</packaging>
<properties>
<jackson.version>2.11.4</jackson.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>
</repositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>connectors-se</artifactId>
<version>${tacokit.components.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- following dependencies fix provided scope to compile for dependencies from connectors-se -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.thoughtworks.paranamer</groupId>
<artifactId>paranamer</artifactId>
<version>2.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.8.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.tukaani</groupId>
<artifactId>xz</artifactId>
<version>1.5</version>
<scope>compile</scope>
</dependency>
<!-- end dependencies which fix provided scope to compile -->
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<filesets>
<fileset>
<directory>${project.basedir}/repository</directory>
<includes>
<include>**/*</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>${project.basedir}/tmp</directory>
<includes>
<include>**/*</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies-jar</id>
<phase>generate-sources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.basedir}/tmp</outputDirectory>
<includeScope>runtime</includeScope>
<useRepositoryLayout>true</useRepositoryLayout>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>zip-maven-repository</id>
<phase>generate-sources</phase>
<configuration>
<tasks>
<zip destfile="${project.basedir}/repository/maven_repository.zip" basedir="${project.basedir}/tmp/" />
<delete dir="${project.basedir}/tmp/" />
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.1-M12</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.maven.repo.tck</artifactId>
<packaging>eclipse-plugin</packaging>
<properties>
<jackson.version>2.12.1</jackson.version>
<slf4j.version>1.7.32</slf4j.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>
</repositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>connectors-se</artifactId>
<version>${tacokit.components.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- following dependencies fix provided scope to compile for dependencies from connectors-se -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.thoughtworks.paranamer</groupId>
<artifactId>paranamer</artifactId>
<version>2.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.8.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.tukaani</groupId>
<artifactId>xz</artifactId>
<version>1.5</version>
<scope>compile</scope>
</dependency>
<!-- end dependencies which fix provided scope to compile -->
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<filesets>
<fileset>
<directory>${project.basedir}/repository</directory>
<includes>
<include>**/*</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>${project.basedir}/tmp</directory>
<includes>
<include>**/*</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies-jar</id>
<phase>generate-sources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.basedir}/tmp</outputDirectory>
<includeScope>runtime</includeScope>
<useRepositoryLayout>true</useRepositoryLayout>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>zip-maven-repository</id>
<phase>generate-sources</phase>
<configuration>
<tasks>
<zip destfile="${project.basedir}/repository/maven_repository.zip" basedir="${project.basedir}/tmp/" />
<delete dir="${project.basedir}/tmp/" />
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

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