Merge pull request #1040 from zbum/feature/eclipse_platform

Feature/eclipse platform

Author: gunlee01

scouter.client.build/pom.xml

@@ -13,16 +13,16 @@
 		<module>../scouter.client.product</module>
 	</modules>
 	<properties>
-		<tycho-version>4.0.8</tycho-version>
+		<tycho-version>5.0.1</tycho-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
-	<repositories>
-	        <repository>
-	        	<id>eclipse-2024-03</id>
-	        	<layout>p2</layout>
-        		<url>https://download.eclipse.org/releases/2024-03/</url>
-	        </repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>eclipse-2025-12</id>
+            <layout>p2</layout>
+            <url>https://download.eclipse.org/releases/2025-12/</url>
+        </repository>
+    </repositories>
 
 	<build>
 		<plugins>

scouter.client.product/scouter.client.product

@@ -26,7 +26,7 @@
       <vmArgs>-Xms128m
 -Xmx1024m
 -XX:+UseG1GC
--Dosgi.requiredJavaVersion=17
+-Dosgi.requiredJavaVersion=21
       </vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
@@ -52,11 +52,16 @@
    </vm>
 
    <plugins>
+      <plugin id="org.eclipse.equinox.launcher"/>
+      <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64" fragment="true"/>
+      <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.aarch64" fragment="true"/>
+      <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64" fragment="true"/>
+      <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64" fragment="true"/>
    </plugins>
 
    <features>
-      <feature id="org.eclipse.rcp"/>
       <feature id="org.eclipse.platform"/>
+      <feature id="org.eclipse.equinox.executable"/>
       <feature id="scouter.client.feature"/>
       <feature id="org.eclipse.emf.ecore"/>
       <feature id="org.eclipse.emf.common"/>

scouter.client/META-INF/MANIFEST.MF

@@ -25,7 +25,7 @@ Require-Bundle:
  org.eclipse.swt,
  org.eclipse.e4.core.commands,
  org.eclipse.e4.ui.services
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
  lib/scouter.common.jar,

scouter.client/pom.xml

@@ -20,8 +20,8 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
-                <source>17</source>
-                <target>17</target>
+                <source>21</source>
+                <target>21</target>
             </configuration>
         </plugin>
     </plugins>

scouter.client/src/scouter/client/ApplicationWorkbenchWindowAdvisor.java

@@ -17,14 +17,22 @@
  */
 package scouter.client;
 
+import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.MenuManager;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.WorkbenchException;
 import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
+import org.eclipse.ui.internal.WorkbenchPlugin;
+import org.eclipse.ui.internal.WorkbenchWindow;
+import org.eclipse.ui.internal.registry.ActionSetRegistry;
+import org.eclipse.ui.internal.registry.IActionSetDescriptor;
 import scouter.Version;
 import scouter.client.misc.UpdateCheckScheduler;
 import scouter.client.notice.NoticeCheckScheduler;
@@ -65,7 +73,10 @@ public ActionBarAdvisor createActionBarAdvisor(
 
 	IWorkbenchWindowConfigurer configurer;
 
+	@SuppressWarnings("restriction")
 	public void preWindowOpen() {
+		removeUnwantedActionSets();
+
 		configurer = getWindowConfigurer();
 		configurer.setInitialSize(new Point(1440, 900));
 		configurer.setShowMenuBar(true);
@@ -79,8 +90,53 @@ public void preWindowOpen() {
 		configurer.setTitle("Version - "+Version.getClientFullVersion() + "(" + TimeZone.getDefault().getDisplayName() + ")");
 	}
 
+	@SuppressWarnings("restriction")
 	public void postWindowOpen() {
 		super.postWindowOpen();
+		removeUnwantedMenus();
+	}
+
+	@SuppressWarnings("restriction")
+	private void removeUnwantedMenus() {
+		IWorkbenchWindow window = getWindowConfigurer().getWindow();
+		if (window instanceof WorkbenchWindow) {
+			MenuManager menuManager = ((WorkbenchWindow) window).getMenuManager();
+			String[] idsToRemove = {
+				"org.eclipse.search.menu",
+				"org.eclipse.ui.run"
+			};
+			for (String id : idsToRemove) {
+				IContributionItem item = menuManager.find(id);
+				if (item != null) {
+					menuManager.remove(item);
+				}
+			}
+			// Also remove by label for any remaining items
+			for (IContributionItem item : menuManager.getItems()) {
+				if (item instanceof MenuManager) {
+					String label = ((MenuManager) item).getMenuText();
+					if (label != null && (label.equals("Search") || label.equals("Run")
+							|| label.equals("&Search") || label.equals("&Run"))) {
+						menuManager.remove(item);
+					}
+				}
+			}
+			menuManager.update(true);
+		}
+	}
+
+	@SuppressWarnings("restriction")
+	private void removeUnwantedActionSets() {
+		ActionSetRegistry reg = WorkbenchPlugin.getDefault().getActionSetRegistry();
+		IActionSetDescriptor[] actionSets = reg.getActionSets();
+		for (IActionSetDescriptor actionSet : actionSets) {
+			String id = actionSet.getId();
+			if (id.startsWith("org.eclipse.search") || id.startsWith("org.eclipse.ui.run")
+					|| id.startsWith("org.eclipse.debug") || id.startsWith("org.eclipse.ui.externaltools")) {
+				IExtension ext = actionSet.getConfigurationElement().getDeclaringExtension();
+				reg.removeExtension(ext, new Object[]{actionSet});
+			}
+		}
 	}
 
 	public void dispose() {

scouter.webapp/pom.xml

@@ -18,7 +18,7 @@
         <scouter.assembly.working.dir>${project.build.directory}/assembly-working</scouter.assembly.working.dir>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <scouter.webapp.jarName>scouter.webapp</scouter.webapp.jarName>
-        <swagger.version>1.5.16</swagger.version>
+        <swagger.version>1.6.14</swagger.version>
     </properties>
 
     <dependencies>