From 9835d4dbe03a264bf3edf7cd5556e297351917b3 Mon Sep 17 00:00:00 2001
From: luiseufrasio <luis.eufrasio@gmail.com>
Date: Sat, 11 Mar 2023 15:47:04 -0300
Subject: [PATCH 01/13] FISH-6772 : menu & handler created

---
 .../plugin.properties                         |  3 ++
 .../plugin.xml                                | 28 ++++++++++--
 .../tools/server/handlers/MigrateHandler.java | 44 +++++++++++++++++++
 3 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java

diff --git a/bundles/fish.payara.eclipse.tools.server/plugin.properties b/bundles/fish.payara.eclipse.tools.server/plugin.properties
index 6fe5d789..3a44d82d 100644
--- a/bundles/fish.payara.eclipse.tools.server/plugin.properties
+++ b/bundles/fish.payara.eclipse.tools.server/plugin.properties
@@ -71,6 +71,9 @@ menu.openserverhome=Server Home Directory
 menu.opendomainhome=Domain Directory
 menu.payaratopmenu=Payara
 
+menu.migrate=Migrate Project
+menu.convert=Convert to Jakarta EE 10
+
 
 
 
diff --git a/bundles/fish.payara.eclipse.tools.server/plugin.xml b/bundles/fish.payara.eclipse.tools.server/plugin.xml
index d448a513..c079a514 100644
--- a/bundles/fish.payara.eclipse.tools.server/plugin.xml
+++ b/bundles/fish.payara.eclipse.tools.server/plugin.xml
@@ -922,6 +922,12 @@
             id="fish.payara.eclipse.tools.server.commands.OpenDomainHomeCommand"
             name="OpenDomainHomeCommand">
         </command>
+        <command
+			id="myplugin.newMenuItem"
+			name="New Menu Item"
+			description="This is a new menu item"
+			categoryId="org.eclipse.ui.category.file">
+		</command>
     </extension>
      
     <!-- 2. Handlers corresponding to the commands defined above  -->
@@ -976,6 +982,11 @@
                 </and>
             </enabledWhen>
         </handler>
+        
+        <handler
+			commandId="fish.payara.eclipse.tools.server.commands.MigrateHandler"
+			class="fish.payara.eclipse.tools.server.handlers.MigrateHandler">
+	   </handler>
     </extension>
 
     <!-- 3. Definitions of the menu entries putting the above defined commands in -->
@@ -1020,10 +1031,19 @@
                 </command>
             </menu>
         </menuContribution>
+        <menuContribution locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu?endof=group.build">
+			<menu id="fish.payara.eclipse.tools.project.actions.migrate" label="%menu.migrate">
+				<command commandId="fish.payara.eclipse.tools.server.commands.MigrateHandler" label="%menu.convert" style="push">
+				</command>
+			</menu>
+		</menuContribution>
+		<menuContribution locationURI="popup:org.eclipse.jdt.ui.PackageExplorer?endof=group.build">
+			<menu id="fish.payara.eclipse.tools.package.actions.migrate" label="%menu.migrate">
+				<command commandId="fish.payara.eclipse.tools.server.commands.MigrateHandler" label="%menu.convert" style="push">
+				</command>
+			</menu>
+		</menuContribution>
     </extension>
- 
-	
-  
   
     <!-- 
         Properties that are being shown for the Payara / GlassFish server when e.g. the server is right clicked
@@ -1226,5 +1246,5 @@
             provider="fish.payara.eclipse.tools.server.jaxrsLibraryproviderID">
         </panel>
     </extension>
-    
+	
 </plugin>
diff --git a/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java b/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
new file mode 100644
index 00000000..dc6c093c
--- /dev/null
+++ b/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
@@ -0,0 +1,44 @@
+package fish.payara.eclipse.tools.server.handlers;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+public class MigrateHandler extends AbstractHandler {
+
+    @Override
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+    	Shell shell = HandlerUtil.getActiveWorkbenchWindow(event).getShell();
+    	
+    	IStructuredSelection selection = getSelection(event);
+        if (selection != null && !selection.isEmpty()) {
+            Object firstElement = selection.getFirstElement();
+            if (firstElement instanceof IResource) {
+                IResource resource = (IResource) firstElement;
+                IPath path = resource.getLocation();
+                if (path != null) {
+                    String folderPath = path.toOSString();
+                    MessageDialog.openInformation(shell, "Folder Path", folderPath);
+                }
+            }
+        }
+    	
+        return null;
+    }
+    
+    private IStructuredSelection getSelection(ExecutionEvent event) {
+        ISelection selection = HandlerUtil.getCurrentSelection(event);
+        if (selection instanceof IStructuredSelection) {
+            return (IStructuredSelection) selection;
+        }
+        return null;
+    }
+
+}

From 08fedcdf45d25cbbfbd7e482d231c0c29a910225 Mon Sep 17 00:00:00 2001
From: luiseufrasio <luis.eufrasio@gmail.com>
Date: Tue, 14 Mar 2023 18:39:20 -0300
Subject: [PATCH 02/13] FISH-6772 : running mvn command

---
 .gitignore                                    | 46 ++++++++++++-
 .../.classpath                                | 12 +---
 .../.classpath                                | 12 +---
 .../tools/server/handlers/MigrateHandler.java | 67 +++++++++++++++++++
 4 files changed, 118 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index ff5d76a0..7357ba3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,46 @@
 **/target/
-**/bin/
\ No newline at end of file
+**/bin/
+/.metadata/.lock
+/.metadata/.log
+/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.location
+/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version
+/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
+/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version
+/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree
+/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
+/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
+/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
+/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jsch.core.prefs
+/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jst.j2ee.webservice.ui.prefs
+/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs
+/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
+/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.navigator.prefs
+/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
+/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
+/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.urischeme.prefs
+/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
+/.metadata/.plugins/org.eclipse.egit.core/.org.eclipse.egit.core.cmp/.project
+/.metadata/.plugins/org.eclipse.egit.core/.org.eclipse.egit.core.cmp/.settings/org.eclipse.core.resources.prefs
+/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache
+/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache
+/.metadata/.plugins/org.eclipse.jdt.core/javaLikeNames.txt
+/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
+/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
+/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
+/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
+/.metadata/.plugins/org.eclipse.m2e.core.ui/dialog_settings.xml
+/.metadata/.plugins/org.eclipse.m2e.core/workspaceState.ser
+/.metadata/.plugins/org.eclipse.m2e.logback/0.log
+/.metadata/.plugins/org.eclipse.m2e.logback/logback.2.1.0.20221015-0744.xml
+/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup
+/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml
+/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
+/.metadata/.plugins/org.eclipse.ui.intro/introstate
+/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
+/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
+/.metadata/version.ini
+/bundles/fish.payara.eclipse.tools.micro/.settings/org.eclipse.jdt.core.prefs
+/bundles/fish.payara.eclipse.tools.server/.settings/org.eclipse.jdt.core.prefs
+/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/RefactorHandler.java
+/features/fish.payara.eclipse.tools.micro.feature/.polyglot.build.properties
+/features/fish.payara.eclipse.tools.server.feature/.polyglot.build.properties
diff --git a/bundles/fish.payara.eclipse.tools.micro/.classpath b/bundles/fish.payara.eclipse.tools.micro/.classpath
index d9925b3f..d4dbdb13 100644
--- a/bundles/fish.payara.eclipse.tools.micro/.classpath
+++ b/bundles/fish.payara.eclipse.tools.micro/.classpath
@@ -1,17 +1,11 @@
 <?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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/fish.payara.eclipse.tools.server/.classpath b/bundles/fish.payara.eclipse.tools.server/.classpath
index d9925b3f..d4dbdb13 100644
--- a/bundles/fish.payara.eclipse.tools.server/.classpath
+++ b/bundles/fish.payara.eclipse.tools.server/.classpath
@@ -1,17 +1,11 @@
 <?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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java b/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
index dc6c093c..9734941c 100644
--- a/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
+++ b/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
@@ -1,5 +1,12 @@
 package fish.payara.eclipse.tools.server.handlers;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -9,9 +16,18 @@
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.console.ConsolePlugin;
+import org.eclipse.ui.console.IConsole;
+import org.eclipse.ui.console.MessageConsole;
+import org.eclipse.ui.console.MessageConsoleStream;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 public class MigrateHandler extends AbstractHandler {
+	
+	 public static final String PAYARA_TRANSFORMER = "fish.payara.transformer";
+	 public static final String PAYARA_TRANSFORMER_MAVEN = "fish.payara.transformer.maven";
+	 public static final String PAYARA_TRANSFORMER_VERSION = "0.2.10";
 
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
@@ -26,6 +42,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
                 if (path != null) {
                     String folderPath = path.toOSString();
                     MessageDialog.openInformation(shell, "Folder Path", folderPath);
+                    runMvnCommand(folderPath, folderPath + "-jakartaEE10");
                 }
             }
         }
@@ -40,5 +57,55 @@ private IStructuredSelection getSelection(ExecutionEvent event) {
         }
         return null;
     }
+    
+    private void runMvnCommand(String srcPath, String targetPath) {
+    	Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+        
+    	// Create a new message console
+        MessageConsole console = new MessageConsole("Maven Command Console", null);
+        ConsolePlugin.getDefault().getConsoleManager().addConsoles(new IConsole[]{console});
+        
+        // Get the console stream
+        MessageConsoleStream consoleStream = console.newMessageStream();
+        
+        // Run the Maven command
+        try {
+        	List<String> command = new ArrayList<>();
+        	command.add("mvn.cmd");
+        	command.add("package");
+        	command.add(getTransformCommand());
+        	command.add("-DselectedSource=" + srcPath);
+        	command.add("-DselectedTarget=" + targetPath);
+        	ProcessBuilder builder = new ProcessBuilder(command);
+        	builder.environment().put("PATH", System.getenv("PATH"));
+        	builder.directory(new File(srcPath));
+        	builder.redirectErrorStream(true);
+        	Process process = builder.start();
+            
+            // Display the output in the console
+        	BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+        	String line = null;
+            while ((line = reader.readLine()) != null) {
+                consoleStream.println(line);
+            }
+            
+            // Wait for the process to finish
+            int exitCode = process.waitFor();
+            
+            if (exitCode == 0) {
+                MessageDialog.openInformation(shell, "Success", "Maven command completed successfully.");
+            } else {
+                MessageDialog.openError(shell, "Error", "Maven command failed with exit code " + exitCode + ".");
+            }
+            
+        } catch (IOException | InterruptedException e) {
+            MessageDialog.openError(shell, "Error", "An error occurred while running the Maven command: " + e.getMessage());
+        }
+    }
+    
+    private String getTransformCommand() {
+        return String.format("%s:%s:%s:run",
+                PAYARA_TRANSFORMER, PAYARA_TRANSFORMER_MAVEN, PAYARA_TRANSFORMER_VERSION);
+    }
 
 }

From 2df08851438024a8c75e30ae2faf8a6634cd1844 Mon Sep 17 00:00:00 2001
From: luiseufrasio <luis.eufrasio@gmail.com>
Date: Wed, 15 Mar 2023 15:32:44 -0300
Subject: [PATCH 03/13] FISH-6772 : letting user choose destination folder &
 checking OS

---
 .../tools/server/handlers/MigrateHandler.java | 64 ++++++++++++-------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java b/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
index 9734941c..d7c40df6 100644
--- a/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
+++ b/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
@@ -15,6 +15,7 @@
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.widgets.DirectoryDialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.console.ConsolePlugin;
@@ -25,14 +26,14 @@
 
 public class MigrateHandler extends AbstractHandler {
 	
-	 public static final String PAYARA_TRANSFORMER = "fish.payara.transformer";
-	 public static final String PAYARA_TRANSFORMER_MAVEN = "fish.payara.transformer.maven";
-	 public static final String PAYARA_TRANSFORMER_VERSION = "0.2.10";
+	public static final String PAYARA_TRANSFORMER = "fish.payara.transformer";
+	public static final String PAYARA_TRANSFORMER_MAVEN = "fish.payara.transformer.maven";
+	public static final String PAYARA_TRANSFORMER_VERSION = "0.2.10";
 
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
     	Shell shell = HandlerUtil.getActiveWorkbenchWindow(event).getShell();
-    	
+
     	IStructuredSelection selection = getSelection(event);
         if (selection != null && !selection.isEmpty()) {
             Object firstElement = selection.getFirstElement();
@@ -40,16 +41,33 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
                 IResource resource = (IResource) firstElement;
                 IPath path = resource.getLocation();
                 if (path != null) {
-                    String folderPath = path.toOSString();
-                    MessageDialog.openInformation(shell, "Folder Path", folderPath);
-                    runMvnCommand(folderPath, folderPath + "-jakartaEE10");
+                    String srcPath = path.toOSString();
+                    String destinationPath = chooseDestinationPath(srcPath, resource.getName());
+					int exitCode = runMvnCommand(srcPath, destinationPath);
+		            if (exitCode == 0) {
+		                MessageDialog.openInformation(shell, "Success", "Project " + destinationPath + " created successfully.");
+		            } else {
+		                MessageDialog.openError(shell, "Error", "Maven command failed with exit code " + exitCode + ".");
+		            }
                 }
             }
         }
-    	
         return null;
     }
     
+    private String chooseDestinationPath(String srcPath, String projectName) {
+    	Shell shell = new Shell();
+    	DirectoryDialog dialog = new DirectoryDialog(shell);
+    	dialog.setText("Choose a destination Folder");
+    	dialog.setMessage("Please select a Directory:");
+    	dialog.setFilterPath(srcPath);
+    	String selectedDirectory = dialog.open();
+    	if (selectedDirectory != null) {
+    	    return selectedDirectory + "/" + projectName + "-jakartaee10";
+    	}
+    	return srcPath + "-jakartaee10";
+    }
+    
     private IStructuredSelection getSelection(ExecutionEvent event) {
         ISelection selection = HandlerUtil.getCurrentSelection(event);
         if (selection instanceof IStructuredSelection) {
@@ -58,20 +76,17 @@ private IStructuredSelection getSelection(ExecutionEvent event) {
         return null;
     }
     
-    private void runMvnCommand(String srcPath, String targetPath) {
+    private int runMvnCommand(String srcPath, String targetPath) {
     	Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
         
-    	// Create a new message console
         MessageConsole console = new MessageConsole("Maven Command Console", null);
         ConsolePlugin.getDefault().getConsoleManager().addConsoles(new IConsole[]{console});
         
-        // Get the console stream
         MessageConsoleStream consoleStream = console.newMessageStream();
         
-        // Run the Maven command
         try {
         	List<String> command = new ArrayList<>();
-        	command.add("mvn.cmd");
+        	command.add(getMvnCommand());
         	command.add("package");
         	command.add(getTransformCommand());
         	command.add("-DselectedSource=" + srcPath);
@@ -82,30 +97,31 @@ private void runMvnCommand(String srcPath, String targetPath) {
         	builder.redirectErrorStream(true);
         	Process process = builder.start();
             
-            // Display the output in the console
         	BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
         	String line = null;
             while ((line = reader.readLine()) != null) {
                 consoleStream.println(line);
             }
             
-            // Wait for the process to finish
-            int exitCode = process.waitFor();
-            
-            if (exitCode == 0) {
-                MessageDialog.openInformation(shell, "Success", "Maven command completed successfully.");
-            } else {
-                MessageDialog.openError(shell, "Error", "Maven command failed with exit code " + exitCode + ".");
-            }
-            
+            return process.waitFor();
         } catch (IOException | InterruptedException e) {
             MessageDialog.openError(shell, "Error", "An error occurred while running the Maven command: " + e.getMessage());
+            return -1;
         }
     }
-    
+
     private String getTransformCommand() {
         return String.format("%s:%s:%s:run",
                 PAYARA_TRANSFORMER, PAYARA_TRANSFORMER_MAVEN, PAYARA_TRANSFORMER_VERSION);
     }
+    
+    private String getMvnCommand() {
+    	String osName = System.getProperty("os.name");
+    	if (osName.contains("Windows")) {
+    	    return "mvn.cmd";
+    	} else {
+    		return "mvn";
+    	}
+    }
 
 }

From 9de030d36cd222a49348f876c209cec6101f780f Mon Sep 17 00:00:00 2001
From: luiseufrasio <luis.eufrasio@gmail.com>
Date: Wed, 15 Mar 2023 17:05:39 -0300
Subject: [PATCH 04/13] FISH-6772 : menu visible only for root project or files

---
 .../plugin.properties                         |  2 +-
 .../plugin.xml                                | 28 +++++++++++++++++++
 .../tools/server/handlers/MigrateHandler.java |  3 +-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/bundles/fish.payara.eclipse.tools.server/plugin.properties b/bundles/fish.payara.eclipse.tools.server/plugin.properties
index 3a44d82d..c93d1cab 100644
--- a/bundles/fish.payara.eclipse.tools.server/plugin.properties
+++ b/bundles/fish.payara.eclipse.tools.server/plugin.properties
@@ -71,7 +71,7 @@ menu.openserverhome=Server Home Directory
 menu.opendomainhome=Domain Directory
 menu.payaratopmenu=Payara
 
-menu.migrate=Migrate Project
+menu.migrate=Migrate
 menu.convert=Convert to Jakarta EE 10
 
 
diff --git a/bundles/fish.payara.eclipse.tools.server/plugin.xml b/bundles/fish.payara.eclipse.tools.server/plugin.xml
index c079a514..5eab11da 100644
--- a/bundles/fish.payara.eclipse.tools.server/plugin.xml
+++ b/bundles/fish.payara.eclipse.tools.server/plugin.xml
@@ -1035,12 +1035,40 @@
 			<menu id="fish.payara.eclipse.tools.project.actions.migrate" label="%menu.migrate">
 				<command commandId="fish.payara.eclipse.tools.server.commands.MigrateHandler" label="%menu.convert" style="push">
 				</command>
+				<visibleWhen>
+					<or>
+						<with variable="activeMenuSelection">
+							<iterate>
+								<adapt type="org.eclipse.core.resources.IProject"></adapt>
+							</iterate>
+						</with>
+						<with variable="activeMenuSelection">
+							<iterate>
+								<adapt type="org.eclipse.core.resources.IFile"></adapt>
+							</iterate>
+						</with>
+					</or>
+	            </visibleWhen>
 			</menu>
 		</menuContribution>
 		<menuContribution locationURI="popup:org.eclipse.jdt.ui.PackageExplorer?endof=group.build">
 			<menu id="fish.payara.eclipse.tools.package.actions.migrate" label="%menu.migrate">
 				<command commandId="fish.payara.eclipse.tools.server.commands.MigrateHandler" label="%menu.convert" style="push">
 				</command>
+				<visibleWhen>
+					<or>
+						<with variable="activeMenuSelection">
+							<iterate>
+								<adapt type="org.eclipse.core.resources.IProject"></adapt>
+							</iterate>
+						</with>
+						<with variable="activeMenuSelection">
+							<iterate>
+								<adapt type="org.eclipse.core.resources.IFile"></adapt>
+							</iterate>
+						</with>
+					</or>
+	            </visibleWhen>
 			</menu>
 		</menuContribution>
     </extension>
diff --git a/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java b/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
index d7c40df6..f86d53f8 100644
--- a/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
+++ b/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
@@ -43,6 +43,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
                 if (path != null) {
                     String srcPath = path.toOSString();
                     String destinationPath = chooseDestinationPath(srcPath, resource.getName());
+                    if ("".equals(destinationPath)) return null;
 					int exitCode = runMvnCommand(srcPath, destinationPath);
 		            if (exitCode == 0) {
 		                MessageDialog.openInformation(shell, "Success", "Project " + destinationPath + " created successfully.");
@@ -65,7 +66,7 @@ private String chooseDestinationPath(String srcPath, String projectName) {
     	if (selectedDirectory != null) {
     	    return selectedDirectory + "/" + projectName + "-jakartaee10";
     	}
-    	return srcPath + "-jakartaee10";
+    	return "";
     }
     
     private IStructuredSelection getSelection(ExecutionEvent event) {

From a6057708041a53dc54dd096ab9d7a7f3feed3d89 Mon Sep 17 00:00:00 2001
From: luiseufrasio <luis.eufrasio@gmail.com>
Date: Wed, 15 Mar 2023 18:35:00 -0300
Subject: [PATCH 05/13] FISH-6772 : suitable for Java Package View

---
 .../tools/server/handlers/MigrateHandler.java | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java b/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
index f86d53f8..33bd49b9 100644
--- a/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
+++ b/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
@@ -10,8 +10,10 @@
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -33,24 +35,31 @@ public class MigrateHandler extends AbstractHandler {
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
     	Shell shell = HandlerUtil.getActiveWorkbenchWindow(event).getShell();
-
     	IStructuredSelection selection = getSelection(event);
         if (selection != null && !selection.isEmpty()) {
             Object firstElement = selection.getFirstElement();
+            IPath path = null;
+            String name = "";
             if (firstElement instanceof IResource) {
-                IResource resource = (IResource) firstElement;
-                IPath path = resource.getLocation();
-                if (path != null) {
-                    String srcPath = path.toOSString();
-                    String destinationPath = chooseDestinationPath(srcPath, resource.getName());
-                    if ("".equals(destinationPath)) return null;
-					int exitCode = runMvnCommand(srcPath, destinationPath);
-		            if (exitCode == 0) {
-		                MessageDialog.openInformation(shell, "Success", "Project " + destinationPath + " created successfully.");
-		            } else {
-		                MessageDialog.openError(shell, "Error", "Maven command failed with exit code " + exitCode + ".");
-		            }
-                }
+            	IResource resource = (IResource) firstElement;
+                path = resource.getLocation();
+                name = resource.getName();
+            } else if (firstElement instanceof IJavaProject) {
+            	IJavaProject javaProject = (IJavaProject) firstElement;
+                IProject project = javaProject.getProject();
+				path = project.getLocation();
+                name = project.getName();
+            }
+            if (path != null && !"".equals(name)) {
+                String srcPath = path.toOSString();
+                String destinationPath = chooseDestinationPath(srcPath, name);
+                if ("".equals(destinationPath)) return null;
+				int exitCode = runMvnCommand(srcPath, destinationPath);
+	            if (exitCode == 0) {
+	                MessageDialog.openInformation(shell, "Success", "Project " + destinationPath + " created successfully.");
+	            } else {
+	                MessageDialog.openError(shell, "Error", "Maven command failed with exit code " + exitCode + ".");
+	            }
             }
         }
         return null;

From b536a342009b17d1ca6d2d6f538e9fdbb57f8f72 Mon Sep 17 00:00:00 2001
From: luiseufrasio <luis.eufrasio@gmail.com>
Date: Thu, 16 Mar 2023 10:21:47 -0300
Subject: [PATCH 06/13] FISH-6772 : migrating files also

---
 .../plugin.xml                                |  2 +-
 .../tools/server/handlers/MigrateHandler.java | 37 +++++++++++++------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/bundles/fish.payara.eclipse.tools.server/plugin.xml b/bundles/fish.payara.eclipse.tools.server/plugin.xml
index 5eab11da..7ab19f06 100644
--- a/bundles/fish.payara.eclipse.tools.server/plugin.xml
+++ b/bundles/fish.payara.eclipse.tools.server/plugin.xml
@@ -1064,7 +1064,7 @@
 						</with>
 						<with variable="activeMenuSelection">
 							<iterate>
-								<adapt type="org.eclipse.core.resources.IFile"></adapt>
+								<adapt type="ICompilationUnit"></adapt>
 							</iterate>
 						</with>
 					</or>
diff --git a/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java b/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
index 33bd49b9..4527a7c5 100644
--- a/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
+++ b/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
@@ -13,6 +13,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
@@ -38,23 +39,34 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
     	IStructuredSelection selection = getSelection(event);
         if (selection != null && !selection.isEmpty()) {
             Object firstElement = selection.getFirstElement();
-            IPath path = null;
+            IPath resourcePath = null;
+            IPath projectPath = null;
             String name = "";
+            boolean isFile = false;
             if (firstElement instanceof IResource) {
             	IResource resource = (IResource) firstElement;
-                path = resource.getLocation();
+                resourcePath = resource.getLocation();
+                projectPath = resourcePath;
                 name = resource.getName();
             } else if (firstElement instanceof IJavaProject) {
             	IJavaProject javaProject = (IJavaProject) firstElement;
                 IProject project = javaProject.getProject();
-				path = project.getLocation();
+				resourcePath = project.getLocation();
+				projectPath = resourcePath;
                 name = project.getName();
+            } else if (firstElement instanceof ICompilationUnit) {
+            	ICompilationUnit file = (ICompilationUnit) firstElement;
+            	resourcePath = file.getResource().getLocation();
+            	projectPath = file.getJavaProject().getProject().getLocation();
+            	name = file.getElementName();
+            	isFile = true;
             }
-            if (path != null && !"".equals(name)) {
-                String srcPath = path.toOSString();
-                String destinationPath = chooseDestinationPath(srcPath, name);
+            if (resourcePath != null && projectPath != null && !"".equals(name)) {
+                String srcPath = resourcePath.toOSString();
+                String srcProjectPath = projectPath.toOSString();
+                String destinationPath = chooseDestinationPath(srcProjectPath, name, isFile);
                 if ("".equals(destinationPath)) return null;
-				int exitCode = runMvnCommand(srcPath, destinationPath);
+				int exitCode = runMvnCommand(srcProjectPath, srcPath, destinationPath);
 	            if (exitCode == 0) {
 	                MessageDialog.openInformation(shell, "Success", "Project " + destinationPath + " created successfully.");
 	            } else {
@@ -65,7 +77,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
         return null;
     }
     
-    private String chooseDestinationPath(String srcPath, String projectName) {
+    private String chooseDestinationPath(String srcPath, String name, boolean isFile) {
     	Shell shell = new Shell();
     	DirectoryDialog dialog = new DirectoryDialog(shell);
     	dialog.setText("Choose a destination Folder");
@@ -73,7 +85,10 @@ private String chooseDestinationPath(String srcPath, String projectName) {
     	dialog.setFilterPath(srcPath);
     	String selectedDirectory = dialog.open();
     	if (selectedDirectory != null) {
-    	    return selectedDirectory + "/" + projectName + "-jakartaee10";
+    		if (isFile) {
+    			return selectedDirectory + "/" + name;
+    		}
+    	    return selectedDirectory + "/" + name + "-JakartaEE10";
     	}
     	return "";
     }
@@ -86,7 +101,7 @@ private IStructuredSelection getSelection(ExecutionEvent event) {
         return null;
     }
     
-    private int runMvnCommand(String srcPath, String targetPath) {
+    private int runMvnCommand(String srcProjectPath, String srcPath, String targetPath) {
     	Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
         
         MessageConsole console = new MessageConsole("Maven Command Console", null);
@@ -103,7 +118,7 @@ private int runMvnCommand(String srcPath, String targetPath) {
         	command.add("-DselectedTarget=" + targetPath);
         	ProcessBuilder builder = new ProcessBuilder(command);
         	builder.environment().put("PATH", System.getenv("PATH"));
-        	builder.directory(new File(srcPath));
+        	builder.directory(new File(srcProjectPath));
         	builder.redirectErrorStream(true);
         	Process process = builder.start();
             

From c959f853aeb77d8adef9e8e9fb29960987834a50 Mon Sep 17 00:00:00 2001
From: Luis Eufrasio Teixeira Neto <luis.eufrasio@gmail.com>
Date: Thu, 16 Mar 2023 10:25:59 -0300
Subject: [PATCH 07/13] Delete .classpath

This one should be ignored
---
 bundles/fish.payara.eclipse.tools.micro/.classpath | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 bundles/fish.payara.eclipse.tools.micro/.classpath

diff --git a/bundles/fish.payara.eclipse.tools.micro/.classpath b/bundles/fish.payara.eclipse.tools.micro/.classpath
deleted file mode 100644
index d4dbdb13..00000000
--- a/bundles/fish.payara.eclipse.tools.micro/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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-17">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

From 6fc49360df4cc0c09e36ebc33fce6194811c45f1 Mon Sep 17 00:00:00 2001
From: Luis Eufrasio Teixeira Neto <luis.eufrasio@gmail.com>
Date: Thu, 16 Mar 2023 10:26:19 -0300
Subject: [PATCH 08/13] Delete .classpath

This one should be ignored
---
 bundles/fish.payara.eclipse.tools.server/.classpath | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 bundles/fish.payara.eclipse.tools.server/.classpath

diff --git a/bundles/fish.payara.eclipse.tools.server/.classpath b/bundles/fish.payara.eclipse.tools.server/.classpath
deleted file mode 100644
index d4dbdb13..00000000
--- a/bundles/fish.payara.eclipse.tools.server/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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-17">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

From 1e6b8a69112e806c00bd5af19a83857e1e1e9af0 Mon Sep 17 00:00:00 2001
From: luiseufrasio <luis.eufrasio@gmail.com>
Date: Thu, 16 Mar 2023 10:34:58 -0300
Subject: [PATCH 09/13] FISH-6772 : undo classpaths

---
 bundles/fish.payara.eclipse.tools.micro/.classpath | 14 ++++++++++----
 .../fish.payara.eclipse.tools.server/.classpath    | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/bundles/fish.payara.eclipse.tools.micro/.classpath b/bundles/fish.payara.eclipse.tools.micro/.classpath
index d4dbdb13..a71f7997 100644
--- a/bundles/fish.payara.eclipse.tools.micro/.classpath
+++ b/bundles/fish.payara.eclipse.tools.micro/.classpath
@@ -1,11 +1,17 @@
 <?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-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
\ No newline at end of file
diff --git a/bundles/fish.payara.eclipse.tools.server/.classpath b/bundles/fish.payara.eclipse.tools.server/.classpath
index d4dbdb13..a71f7997 100644
--- a/bundles/fish.payara.eclipse.tools.server/.classpath
+++ b/bundles/fish.payara.eclipse.tools.server/.classpath
@@ -1,11 +1,17 @@
 <?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-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
\ No newline at end of file

From 07f0807fa4491a233f9b9c6d4e8490d99cdc23ed Mon Sep 17 00:00:00 2001
From: luiseufrasio <luis.eufrasio@gmail.com>
Date: Thu, 16 Mar 2023 10:43:24 -0300
Subject: [PATCH 10/13] FISH-6772 : undo classpaths

---
 .../fish.payara.eclipse.tools.micro/.classpath  | 17 +++++++++++++++++
 .../fish.payara.eclipse.tools.server/.classpath | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 bundles/fish.payara.eclipse.tools.micro/.classpath
 create mode 100644 bundles/fish.payara.eclipse.tools.server/.classpath

diff --git a/bundles/fish.payara.eclipse.tools.micro/.classpath b/bundles/fish.payara.eclipse.tools.micro/.classpath
new file mode 100644
index 00000000..a71f7997
--- /dev/null
+++ b/bundles/fish.payara.eclipse.tools.micro/.classpath
@@ -0,0 +1,17 @@
+<?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-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
\ No newline at end of file
diff --git a/bundles/fish.payara.eclipse.tools.server/.classpath b/bundles/fish.payara.eclipse.tools.server/.classpath
new file mode 100644
index 00000000..a71f7997
--- /dev/null
+++ b/bundles/fish.payara.eclipse.tools.server/.classpath
@@ -0,0 +1,17 @@
+<?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-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
\ No newline at end of file

From 63c15973b41ef9f50632013079f2b96cfe9f94ed Mon Sep 17 00:00:00 2001
From: luiseufrasio <luis.eufrasio@gmail.com>
Date: Thu, 16 Mar 2023 10:54:10 -0300
Subject: [PATCH 11/13] FISH-6772 : fixed for ProjectExplorer

---
 bundles/fish.payara.eclipse.tools.server/plugin.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/fish.payara.eclipse.tools.server/plugin.xml b/bundles/fish.payara.eclipse.tools.server/plugin.xml
index 7ab19f06..f1f91c15 100644
--- a/bundles/fish.payara.eclipse.tools.server/plugin.xml
+++ b/bundles/fish.payara.eclipse.tools.server/plugin.xml
@@ -1044,7 +1044,7 @@
 						</with>
 						<with variable="activeMenuSelection">
 							<iterate>
-								<adapt type="org.eclipse.core.resources.IFile"></adapt>
+								<adapt type="org.eclipse.jdt.core.ICompilationUnit"></adapt>
 							</iterate>
 						</with>
 					</or>
@@ -1064,7 +1064,7 @@
 						</with>
 						<with variable="activeMenuSelection">
 							<iterate>
-								<adapt type="ICompilationUnit"></adapt>
+								<adapt type="org.eclipse.jdt.core.ICompilationUnit"></adapt>
 							</iterate>
 						</with>
 					</or>

From 2c729e09b3836321adabd35e3cfb9576c20f9832 Mon Sep 17 00:00:00 2001
From: luiseufrasio <luis.eufrasio@gmail.com>
Date: Tue, 28 Mar 2023 10:35:11 -0300
Subject: [PATCH 12/13] FISH-6772 : unnecessary command removed

---
 bundles/fish.payara.eclipse.tools.server/plugin.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/bundles/fish.payara.eclipse.tools.server/plugin.xml b/bundles/fish.payara.eclipse.tools.server/plugin.xml
index f1f91c15..1c2aa824 100644
--- a/bundles/fish.payara.eclipse.tools.server/plugin.xml
+++ b/bundles/fish.payara.eclipse.tools.server/plugin.xml
@@ -922,12 +922,6 @@
             id="fish.payara.eclipse.tools.server.commands.OpenDomainHomeCommand"
             name="OpenDomainHomeCommand">
         </command>
-        <command
-			id="myplugin.newMenuItem"
-			name="New Menu Item"
-			description="This is a new menu item"
-			categoryId="org.eclipse.ui.category.file">
-		</command>
     </extension>
      
     <!-- 2. Handlers corresponding to the commands defined above  -->

From cd338422cedc3778539efed020881764ebc1ebc6 Mon Sep 17 00:00:00 2001
From: luiseufrasio <luis.eufrasio@gmail.com>
Date: Wed, 29 Mar 2023 08:03:13 -0300
Subject: [PATCH 13/13] FISH-6772 : copyrights added

---
 .../eclipse/tools/server/handlers/MigrateHandler.java    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java b/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
index 4527a7c5..c093ee9e 100644
--- a/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
+++ b/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/MigrateHandler.java
@@ -1,3 +1,12 @@
+/******************************************************************************
+ * Copyright (c) 2023 Payara Foundation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ * SPDX-License-Identifier: EPL-2.0
+ ******************************************************************************/
+
 package fish.payara.eclipse.tools.server.handlers;
 
 import java.io.BufferedReader;