Merge remote-tracking branch 'origin/master' into kjwang/P_R2022_07

Make patch R2022-07
Make test patch R2022-07
2021-11-10 10:27:50 +08:00 · 2021-11-09 18:17:41 +08:00 · 2021-11-09 17:19:19 +08:00 · 2021-11-08 16:24:58 +08:00 · 2021-11-08 15:25:11 +08:00 · 2021-11-08 10:05:28 +08:00
23 changed files with 377 additions and 2 deletions
--- a/main/features/org.talend.lite.designer.new.feature1/.project
+++ b/main/features/org.talend.lite.designer.new.feature1/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.lite.designer.new.feature1</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
--- a/main/features/org.talend.lite.designer.new.feature1/build.properties
+++ b/main/features/org.talend.lite.designer.new.feature1/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               build.properties
--- a/main/features/org.talend.lite.designer.new.feature1/feature.xml
+++ b/main/features/org.talend.lite.designer.new.feature1/feature.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.lite.designer.new.feature1"
+      label="Talend Studio Designer Feature"
+      version="8.0.1.qualifier"
+      provider-name=".Talend SA."
+      license-feature="org.talend.lite.root.feature"
+      license-feature-version="8.0.1.qualifier">
+
+   <description url="http://www.example.com/description">
+      Designer of Talend Studio 20211108
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license>
+      [Enter License Description here.]
+   </license>
+
+   <requires>
+      <import plugin="org.talend.new1.plugin"/>
+   </requires>
+
+</feature>
--- a/main/features/org.talend.lite.designer.new.feature1/pom.xml
+++ b/main/features/org.talend.lite.designer.new.feature1/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.lite.designer.new.feature1</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
--- a/main/plugins/org.talend.core.repository/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.core.repository/META-INF/MANIFEST.MF
@@ -15,7 +15,9 @@ Require-Bundle: org.eclipse.ui,
 org.talend.libraries.apache,
 org.eclipse.osgi.services,
 org.eclipse.ui.navigator,
- org.talend.libraries.jackson
+ org.talend.libraries.jackson,
+ org.talend.new1.plugin,
+ org.talend.new2.plugin
 Export-Package: org.talend.core.repository,
 org.talend.core.repository.constants,
 org.talend.core.repository.document,
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java
@@ -151,11 +151,15 @@ import org.talend.core.runtime.util.ItemDateParser;
 import org.talend.core.runtime.util.JavaHomeUtil;
 import org.talend.core.runtime.util.SharedStudioUtils;
 import org.talend.core.service.ICoreUIService;
+import org.talend.core.service.INewDqFeatureService;
+import org.talend.core.service.INewDqService;
 import org.talend.core.utils.CodesJarResourceCache;
 import org.talend.cwm.helper.SubItemHelper;
 import org.talend.cwm.helper.TableHelper;
 import org.talend.designer.runprocess.IRunProcessService;
 import org.talend.login.ILoginTask;
+import org.talend.new1.plugin.New1PluginLogger;
+import org.talend.new2.plugin.New2PluginLogger;
 import org.talend.repository.ProjectManager;
 import org.talend.repository.ReferenceProjectProblemManager;
 import org.talend.repository.ReferenceProjectProvider;
@@ -179,7 +183,7 @@ import orgomg.cwm.objectmodel.core.ModelElement;
 */
 public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {

-    private static final int MAX_TASKS = 8;
+    private static final int MAX_TASKS =8;

    private static Logger log = Logger.getLogger(ProxyRepositoryFactory.class);

@@ -2138,6 +2142,16 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
     */
    public void logOnProject(Project project, IProgressMonitor monitor) throws LoginException, PersistenceException {
        unregisterM2EServiceBeforeLogon();
+        New2PluginLogger.log();
+        New1PluginLogger.log();
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(INewDqService.class)) {
+            INewDqService service = GlobalServiceRegister.getDefault().getService(INewDqService.class);
+            service.log();
+        }
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(INewDqFeatureService.class)) {
+            INewDqFeatureService service = GlobalServiceRegister.getDefault().getService(INewDqFeatureService.class);
+            service.log();
+        }
        try {
            TimeMeasurePerformance.begin("logOnProject", "logon project name '" + project.getLabel()+"'"); //$NON-NLS-1$ //$NON-NLS-2$
            try {
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/INewDqFeatureService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/INewDqFeatureService.java
@@ -0,0 +1,12 @@
+package org.talend.core.service;
+
+import org.talend.core.IService;
+
+/**
+ * 
+ * @author kjwang
+ *
+ */
+public interface INewDqFeatureService extends IService {
+    public void log();
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/INewDqService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/INewDqService.java
@@ -0,0 +1,8 @@
+package org.talend.core.service;
+
+import org.talend.core.IService;
+
+
+public interface INewDqService extends IService {
+    public void log();
+}
--- a/main/plugins/org.talend.new1.plugin/.classpath
+++ b/main/plugins/org.talend.new1.plugin/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
--- a/main/plugins/org.talend.new1.plugin/.project
+++ b/main/plugins/org.talend.new1.plugin/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.new1.plugin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
--- a/main/plugins/org.talend.new1.plugin/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.new1.plugin/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Plugin
+Bundle-SymbolicName: org.talend.new1.plugin
+Bundle-Version: 8.0.1.qualifier
+Bundle-Activator: org.talend.new1.plugin.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.talend.commons.runtime;bundle-version="8.0.1"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.talend.new1.plugin
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: Talend
+Export-Package: org.talend.new1.plugin
--- a/main/plugins/org.talend.new1.plugin/build.properties
+++ b/main/plugins/org.talend.new1.plugin/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
--- a/main/plugins/org.talend.new1.plugin/pom.xml
+++ b/main/plugins/org.talend.new1.plugin/pom.xml
@@ -0,0 +1,28 @@
+<?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.new1.plugin</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+	<plugins>
+	  <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+		<version>2.8.2</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>deploy</phase>
+          </execution>
+        </executions>
+      </plugin>
+	</plugins>
+  </build>
+</project>
--- a/main/plugins/org.talend.new1.plugin/src/org/talend/new1/plugin/Activator.java
+++ b/main/plugins/org.talend.new1.plugin/src/org/talend/new1/plugin/Activator.java
@@ -0,0 +1,44 @@
+package org.talend.new1.plugin;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.talend.new1.plugin"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
--- a/main/plugins/org.talend.new1.plugin/src/org/talend/new1/plugin/New1PluginLogger.java
+++ b/main/plugins/org.talend.new1.plugin/src/org/talend/new1/plugin/New1PluginLogger.java
@@ -0,0 +1,10 @@
+package org.talend.new1.plugin;
+
+import org.talend.commons.exception.ExceptionHandler;
+
+public class New1PluginLogger {
+    public static void log() {
+        ExceptionHandler.log("R2022-03 the plugins: " + Activator.PLUGIN_ID + " started -20211108");
+    }
+
+}
--- a/main/plugins/org.talend.new2.plugin/.classpath
+++ b/main/plugins/org.talend.new2.plugin/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
--- a/main/plugins/org.talend.new2.plugin/.project
+++ b/main/plugins/org.talend.new2.plugin/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.new2.plugin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
--- a/main/plugins/org.talend.new2.plugin/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.new2.plugin/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Plugin
+Bundle-SymbolicName: org.talend.new2.plugin
+Bundle-Version: 8.0.1.qualifier
+Bundle-Activator: org.talend.new2.plugin.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.talend.commons.runtime;bundle-version="8.0.1"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.talend.new1.plugin
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: Talend
+Export-Package: org.talend.new2.plugin
--- a/main/plugins/org.talend.new2.plugin/build.properties
+++ b/main/plugins/org.talend.new2.plugin/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
--- a/main/plugins/org.talend.new2.plugin/pom.xml
+++ b/main/plugins/org.talend.new2.plugin/pom.xml
@@ -0,0 +1,28 @@
+<?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.new2.plugin</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+	<plugins>
+	  <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+		<version>2.8.2</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>deploy</phase>
+          </execution>
+        </executions>
+      </plugin>
+	</plugins>
+  </build>
+</project>
--- a/main/plugins/org.talend.new2.plugin/src/org/talend/new2/plugin/Activator.java
+++ b/main/plugins/org.talend.new2.plugin/src/org/talend/new2/plugin/Activator.java
@@ -0,0 +1,46 @@
+package org.talend.new2.plugin;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+import org.talend.commons.exception.ExceptionHandler;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.talend.new2.plugin"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		ExceptionHandler.log("====R2022-03 the plugins: " + PLUGIN_ID + " started====");
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
--- a/main/plugins/org.talend.new2.plugin/src/org/talend/new2/plugin/New2PluginLogger.java
+++ b/main/plugins/org.talend.new2.plugin/src/org/talend/new2/plugin/New2PluginLogger.java
@@ -0,0 +1,10 @@
+package org.talend.new2.plugin;
+
+import org.talend.commons.exception.ExceptionHandler;
+
+public class New2PluginLogger {
+    public static void log() {
+        ExceptionHandler.log("R2022-03 the plugins: " + Activator.PLUGIN_ID + " started -20211108");
+    }
+
+}
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,7 @@
 		<module>main/features/org.talend.update.p2.feature</module>
 		<module>main/features/org.talend.updates.feature</module>
 		<module>main/features/org.talend.utils.feature</module>
+		<module>main/features/org.talend.lite.designer.new.feature1</module>
 		<module>main/plugins/org.talend.common.ui.runtime</module>
 		<module>main/plugins/org.talend.commons.runtime</module>
 		<module>main/plugins/org.talend.commons.ui</module>
@@ -116,6 +117,9 @@
 		<module>main/plugins/org.talend.designer.maven.repo.tck</module>
        <module>main/plugins/org.talend.designer.maven.repo.tcksdk</module>
 		<module>main/plugins/org.talend.designer.maven.repo.tcompv0</module>
+		
+		<module>main/plugins/org.talend.new1.plugin</module>
+		<module>main/plugins/org.talend.new2.plugin</module>

 		<module>main/plugins/org.talend.libraries.persist.lookup</module>
 		<module>main/plugins/org.talend.designer.maven.aether</module>
Author	SHA1	Message	Date
kjwang-talend	cf6edea5a5	Merge remote-tracking branch 'origin/master' into kjwang/P_R2022_07	2021-11-10 10:27:50 +08:00
kjwang-talend	29c59ff8b1	Make patch R2022-07	2021-11-09 18:17:41 +08:00
Chao MENG	40aa1a3d48	Make test patch R2022-07	2021-11-09 17:19:19 +08:00
kjwang-talend	8ac98a5797	Make patch R2022-06	2021-11-08 16:24:58 +08:00
kjwang-talend	51ab061d80	Make test patch R2022-04v2	2021-11-08 15:25:11 +08:00
kjwang-talend	86c3943a3e	Merge remote-tracking branch 'origin/master' into kjwang/P_R2022-04_v2	2021-11-08 10:05:28 +08:00
kjwang-talend	9470cecf58	Merge remote-tracking branch 'origin/master' into kjwang/P_R2022-06	2021-11-05 17:30:32 +08:00
kjwang-talend	4b272b3baa	Make test patch R2022-06	2021-11-05 15:56:57 +08:00
kjwang-talend	9220bfeaa4	Make temp patch R2022-04 v2	2021-11-02 18:21:24 +08:00
kjwang-talend	76a4b8ee61	Make temp patch R2022-04	2021-11-01 19:35:57 +08:00