Merge pull request #57 from jGauravGupta/eclipse-tycho

FISH-6776 Payara Server tools for Eclipse IDE
payara · Jan 2, 2023 · 91e66b3 · 91e66b3
2 parents eb6abbf + d677a08
commit 91e66b3
Show file tree

Hide file tree

Showing 504 changed files with 63,210 additions and 85 deletions.
diff --git a/bundles/fish.payara.eclipse.micro/.classpath → ...ish.payara.eclipse.tools.micro/.classpath b/bundles/fish.payara.eclipse.micro/.classpath → ...ish.payara.eclipse.tools.micro/.classpath
diff --git a/bundles/fish.payara.eclipse.micro/.project → .../fish.payara.eclipse.tools.micro/.project b/bundles/fish.payara.eclipse.micro/.project → .../fish.payara.eclipse.tools.micro/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>fish.payara.eclipse.micro</name>
+	<name>fish.payara.eclipse.tools.micro</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/...settings/org.eclipse.core.resources.prefs → ...settings/org.eclipse.core.resources.prefs b/...settings/org.eclipse.core.resources.prefs → ...settings/org.eclipse.core.resources.prefs
diff --git a/...icro/.settings/org.eclipse.m2e.core.prefs → ...icro/.settings/org.eclipse.m2e.core.prefs b/...icro/.settings/org.eclipse.m2e.core.prefs → ...icro/.settings/org.eclipse.m2e.core.prefs
diff --git a/...payara.eclipse.micro/META-INF/MANIFEST.MF → ....eclipse.tools.micro/META-INF/MANIFEST.MF b/...payara.eclipse.micro/META-INF/MANIFEST.MF → ....eclipse.tools.micro/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Payara Micro Tools
-Bundle-SymbolicName: fish.payara.eclipse.micro;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-SymbolicName: fish.payara.eclipse.tools.micro;singleton:=true
+Bundle-Version: 2.0.0.Beta1
 Bundle-ClassPath: .
 Bundle-Localization: plugin
-Bundle-Activator: fish.payara.eclipse.micro.PayaraMicroPlugin
+Bundle-Activator: fish.payara.eclipse.tools.micro.PayaraMicroPlugin
 Bundle-Vendor: Payara
 Require-Bundle: org.eclipse.ui,
  org.eclipse.swt,

diff --git a/...ish.payara.eclipse.micro/build.properties → ...yara.eclipse.tools.micro/build.properties b/...ish.payara.eclipse.micro/build.properties → ...yara.eclipse.tools.micro/build.properties
diff --git a/...yara.eclipse.micro/icons/payara-micro.png → ...clipse.tools.micro/icons/payara-micro.png b/...yara.eclipse.micro/icons/payara-micro.png → ...clipse.tools.micro/icons/payara-micro.png
diff --git a/...sh.payara.eclipse.micro/plugin.properties → ...ara.eclipse.tools.micro/plugin.properties b/...sh.payara.eclipse.micro/plugin.properties → ...ara.eclipse.tools.micro/plugin.properties
diff --git a/bundles/fish.payara.eclipse.micro/plugin.xml → ...ish.payara.eclipse.tools.micro/plugin.xml b/bundles/fish.payara.eclipse.micro/plugin.xml → ...ish.payara.eclipse.tools.micro/plugin.xml
@@ -4,16 +4,16 @@
     <extension
         point="org.eclipse.debug.core.processFactories">
         <processFactory
-            class="fish.payara.eclipse.micro.MicroRuntimeProcessFactory"
-            id="fish.payara.eclipse.micro.processFactory">
+            class="fish.payara.eclipse.tools.micro.MicroRuntimeProcessFactory"
+            id="fish.payara.eclipse.tools.micro.processFactory">
         </processFactory>
     </extension>
     <extension
         point="org.eclipse.debug.core.launchConfigurationTypes">
         <launchConfigurationType
-            id="fish.payara.eclipse.micro.launchConfigurationType"
+            id="fish.payara.eclipse.tools.micro.launchConfigurationType"
             name="%payara.micro.runConfigurationName"
-            delegate="fish.payara.eclipse.micro.MicroLaunchDelegate"
+            delegate="fish.payara.eclipse.tools.micro.MicroLaunchDelegate"
             modes="run, debug"
             sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
             sourcePathComputerId="org.eclipse.jst.server.generic.core.sourcePathComputer"/>
@@ -26,9 +26,9 @@
         </category>
         <wizard
             category="fish.payara.eclipse.tools"
-            class="fish.payara.eclipse.micro.ui.wizards.MicroProjectWizard"
+            class="fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard"
             icon="icons/payara-micro.png"
-            id="fish.payara.eclipse.micro.ui.wizards.createProject"
+            id="fish.payara.eclipse.tools.micro.ui.wizards.createProject"
             name="%payara.micro.project.wizard.title"
             project="true">
             <description>
@@ -40,18 +40,18 @@
     <extension
         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
         <launchConfigurationTabGroup
-            class="fish.payara.eclipse.micro.ui.MicroLaunchConfigurationTabGroup"
-            id="fish.payara.eclipse.micro.ui.launchConfigurationTabGroup"
-            type="fish.payara.eclipse.micro.launchConfigurationType">
+            class="fish.payara.eclipse.tools.micro.ui.MicroLaunchConfigurationTabGroup"
+            id="fish.payara.eclipse.tools.micro.ui.launchConfigurationTabGroup"
+            type="fish.payara.eclipse.tools.micro.launchConfigurationType">
         </launchConfigurationTabGroup>
     </extension>
 
     <extension
         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
         <launchConfigurationTypeImage
-            configTypeID="fish.payara.eclipse.micro.launchConfigurationType"
+            configTypeID="fish.payara.eclipse.tools.micro.launchConfigurationType"
             icon="icons/payara-micro.png"
-            id="fish.payara.eclipse.micro.ui.launchConfigurationTypeImage">
+            id="fish.payara.eclipse.tools.micro.ui.launchConfigurationTypeImage">
         </launchConfigurationTypeImage>
     </extension>
 

diff --git a/bundles/fish.payara.eclipse.micro/pom.xml → ...s/fish.payara.eclipse.tools.micro/pom.xml b/bundles/fish.payara.eclipse.micro/pom.xml → ...s/fish.payara.eclipse.tools.micro/pom.xml
@@ -3,13 +3,13 @@
          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>
-    <artifactId>fish.payara.eclipse.micro</artifactId>
+    <artifactId>fish.payara.eclipse.tools.micro</artifactId>
     <packaging>eclipse-plugin</packaging>
     <description>Payara Micro Eclipse Tools</description>
     <parent>
         <groupId>fish.payara.eclipse</groupId>
         <artifactId>fish.payara.eclipse.bundles</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0.Beta1</version>
     </parent>
     <build>
         <sourceDirectory>src</sourceDirectory>

diff --git a/.../fish/payara/eclipse/micro/BuildTool.java → ...payara/eclipse/tools/micro/BuildTool.java b/.../fish/payara/eclipse/micro/BuildTool.java → ...payara/eclipse/tools/micro/BuildTool.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v20.html
  * SPDX-License-Identifier: EPL-2.0
  */
-package fish.payara.eclipse.micro;
+package fish.payara.eclipse.tools.micro;
 
 import java.io.FileNotFoundException;
 import java.util.List;

diff --git a/...payara/eclipse/micro/GradleBuildTool.java → .../eclipse/tools/micro/GradleBuildTool.java b/...payara/eclipse/micro/GradleBuildTool.java → .../eclipse/tools/micro/GradleBuildTool.java
@@ -7,11 +7,11 @@
  * http://www.eclipse.org/legal/epl-v20.html
  * SPDX-License-Identifier: EPL-2.0
  */
-package fish.payara.eclipse.micro;
+package fish.payara.eclipse.tools.micro;
 
-import static fish.payara.eclipse.micro.MicroConstants.EXPLODED_WAR_BUILD_ARTIFACT;
-import static fish.payara.eclipse.micro.MicroConstants.UBER_JAR_BUILD_ARTIFACT;
-import static fish.payara.eclipse.micro.MicroConstants.WAR_BUILD_ARTIFACT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.EXPLODED_WAR_BUILD_ARTIFACT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.UBER_JAR_BUILD_ARTIFACT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.WAR_BUILD_ARTIFACT;
 
 import java.io.File;
 import java.io.FileNotFoundException;

diff --git a/.../payara/eclipse/micro/MavenBuildTool.java → ...a/eclipse/tools/micro/MavenBuildTool.java b/.../payara/eclipse/micro/MavenBuildTool.java → ...a/eclipse/tools/micro/MavenBuildTool.java
@@ -7,11 +7,11 @@
  * http://www.eclipse.org/legal/epl-v20.html
  * SPDX-License-Identifier: EPL-2.0
  */
-package fish.payara.eclipse.micro;
+package fish.payara.eclipse.tools.micro;
 
-import static fish.payara.eclipse.micro.MicroConstants.EXPLODED_WAR_BUILD_ARTIFACT;
-import static fish.payara.eclipse.micro.MicroConstants.UBER_JAR_BUILD_ARTIFACT;
-import static fish.payara.eclipse.micro.MicroConstants.WAR_BUILD_ARTIFACT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.EXPLODED_WAR_BUILD_ARTIFACT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.UBER_JAR_BUILD_ARTIFACT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.WAR_BUILD_ARTIFACT;
 
 import java.io.File;
 import java.io.FileNotFoundException;

diff --git a/...c/fish/payara/eclipse/micro/Messages.java → .../payara/eclipse/tools/micro/Messages.java b/...c/fish/payara/eclipse/micro/Messages.java → .../payara/eclipse/tools/micro/Messages.java
@@ -16,14 +16,14 @@
  * SPDX-License-Identifier: EPL-2.0
  ******************************************************************************/
 
-package fish.payara.eclipse.micro;
+package fish.payara.eclipse.tools.micro;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
 
 	static {
-		initializeMessages("fish.payara.eclipse.micro.Messages", Messages.class);
+		initializeMessages("fish.payara.eclipse.tools.micro.Messages", Messages.class);
 	}
 
 	public static String serverHome;

diff --git a/.../payara/eclipse/micro/Messages.properties → ...a/eclipse/tools/micro/Messages.properties b/.../payara/eclipse/micro/Messages.properties → ...a/eclipse/tools/micro/Messages.properties
diff --git a/.../payara/eclipse/micro/MicroConstants.java → ...a/eclipse/tools/micro/MicroConstants.java b/.../payara/eclipse/micro/MicroConstants.java → ...a/eclipse/tools/micro/MicroConstants.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v20.html
  * SPDX-License-Identifier: EPL-2.0
  */
-package fish.payara.eclipse.micro;
+package fish.payara.eclipse.tools.micro;
 
 public interface MicroConstants {
 

diff --git a/...ra/eclipse/micro/MicroLaunchDelegate.java → ...ipse/tools/micro/MicroLaunchDelegate.java b/...ra/eclipse/micro/MicroLaunchDelegate.java → ...ipse/tools/micro/MicroLaunchDelegate.java
@@ -7,14 +7,14 @@
  * http://www.eclipse.org/legal/epl-v20.html
  * SPDX-License-Identifier: EPL-2.0
  */
-package fish.payara.eclipse.micro;
+package fish.payara.eclipse.tools.micro;
 
-import static fish.payara.eclipse.micro.MicroConstants.ATTR_DEBUG_PORT;
-import static fish.payara.eclipse.micro.MicroConstants.ATTR_HOST_NAME;
-import static fish.payara.eclipse.micro.MicroConstants.ATTR_PORT;
-import static fish.payara.eclipse.micro.MicroConstants.DEFAULT_DEBUG_PORT;
-import static fish.payara.eclipse.micro.MicroConstants.DEFAULT_HOST;
-import static fish.payara.eclipse.micro.MicroConstants.PLUGIN_ID;
+import static fish.payara.eclipse.tools.micro.MicroConstants.ATTR_DEBUG_PORT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.ATTR_HOST_NAME;
+import static fish.payara.eclipse.tools.micro.MicroConstants.ATTR_PORT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.DEFAULT_DEBUG_PORT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.DEFAULT_HOST;
+import static fish.payara.eclipse.tools.micro.MicroConstants.PLUGIN_ID;
 import static org.eclipse.core.runtime.IStatus.ERROR;
 import static org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants.ATTR_ALLOW_TERMINATE;
 import static org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants.ATTR_CONNECT_MAP;

diff --git a/...ra/eclipse/micro/MicroRuntimeProcess.java → ...ipse/tools/micro/MicroRuntimeProcess.java b/...ra/eclipse/micro/MicroRuntimeProcess.java → ...ipse/tools/micro/MicroRuntimeProcess.java
@@ -7,14 +7,14 @@
  * http://www.eclipse.org/legal/epl-v20.html
  * SPDX-License-Identifier: EPL-2.0
  */
-package fish.payara.eclipse.micro;
-
-import static fish.payara.eclipse.micro.Messages.errorInInitializingMicroWatcher;
-import static fish.payara.eclipse.micro.Messages.errorInReloadingMicro;
-import static fish.payara.eclipse.micro.Messages.errorInTerminatingMicro;
-import static fish.payara.eclipse.micro.MicroConstants.ATTR_RELOAD_ARTIFACT;
-import static fish.payara.eclipse.micro.MicroConstants.HOT_DEPLOY_ARTIFACT;
-import static fish.payara.eclipse.micro.MicroConstants.PROJECT_NAME_ATTR;
+package fish.payara.eclipse.tools.micro;
+
+import static fish.payara.eclipse.tools.micro.Messages.errorInInitializingMicroWatcher;
+import static fish.payara.eclipse.tools.micro.Messages.errorInReloadingMicro;
+import static fish.payara.eclipse.tools.micro.Messages.errorInTerminatingMicro;
+import static fish.payara.eclipse.tools.micro.MicroConstants.ATTR_RELOAD_ARTIFACT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.HOT_DEPLOY_ARTIFACT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.PROJECT_NAME_ATTR;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...pse/micro/MicroRuntimeProcessFactory.java → ...ols/micro/MicroRuntimeProcessFactory.java b/...pse/micro/MicroRuntimeProcessFactory.java → ...ols/micro/MicroRuntimeProcessFactory.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v20.html
  * SPDX-License-Identifier: EPL-2.0
  */
-package fish.payara.eclipse.micro;
+package fish.payara.eclipse.tools.micro;
 
 import java.util.Map;
 

diff --git a/...yara/eclipse/micro/PayaraMicroPlugin.java → ...clipse/tools/micro/PayaraMicroPlugin.java b/...yara/eclipse/micro/PayaraMicroPlugin.java → ...clipse/tools/micro/PayaraMicroPlugin.java
@@ -2,7 +2,7 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
  */
-package fish.payara.eclipse.micro;
+package fish.payara.eclipse.tools.micro;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 

diff --git a/.../ui/MicroLaunchConfigurationTabGroup.java → .../ui/MicroLaunchConfigurationTabGroup.java b/.../ui/MicroLaunchConfigurationTabGroup.java → .../ui/MicroLaunchConfigurationTabGroup.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v20.html
  * SPDX-License-Identifier: EPL-2.0
  */
-package fish.payara.eclipse.micro.ui;
+package fish.payara.eclipse.tools.micro.ui;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ara/eclipse/micro/ui/MicroProjectTab.java → ...lipse/tools/micro/ui/MicroProjectTab.java b/...ara/eclipse/micro/ui/MicroProjectTab.java → ...lipse/tools/micro/ui/MicroProjectTab.java
@@ -7,20 +7,20 @@
  * http://www.eclipse.org/legal/epl-v20.html
  * SPDX-License-Identifier: EPL-2.0
  */
-package fish.payara.eclipse.micro.ui;
+package fish.payara.eclipse.tools.micro.ui;
 
-import static fish.payara.eclipse.micro.MicroConstants.ATTR_BUILD_ARTIFACT;
-import static fish.payara.eclipse.micro.MicroConstants.ATTR_CONTEXT_PATH;
-import static fish.payara.eclipse.micro.MicroConstants.ATTR_DEBUG_PORT;
-import static fish.payara.eclipse.micro.MicroConstants.ATTR_MICRO_VERSION;
-import static fish.payara.eclipse.micro.MicroConstants.ATTR_RELOAD_ARTIFACT;
-import static fish.payara.eclipse.micro.MicroConstants.AUTO_DEPLOY_ARTIFACT;
-import static fish.payara.eclipse.micro.MicroConstants.DEFAULT_DEBUG_PORT;
-import static fish.payara.eclipse.micro.MicroConstants.EXPLODED_WAR_BUILD_ARTIFACT;
-import static fish.payara.eclipse.micro.MicroConstants.HOT_DEPLOY_ARTIFACT;
-import static fish.payara.eclipse.micro.MicroConstants.JAVA_HOME_ENV_VAR;
-import static fish.payara.eclipse.micro.MicroConstants.UBER_JAR_BUILD_ARTIFACT;
-import static fish.payara.eclipse.micro.MicroConstants.WAR_BUILD_ARTIFACT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.ATTR_BUILD_ARTIFACT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.ATTR_CONTEXT_PATH;
+import static fish.payara.eclipse.tools.micro.MicroConstants.ATTR_DEBUG_PORT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.ATTR_MICRO_VERSION;
+import static fish.payara.eclipse.tools.micro.MicroConstants.ATTR_RELOAD_ARTIFACT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.AUTO_DEPLOY_ARTIFACT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.DEFAULT_DEBUG_PORT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.EXPLODED_WAR_BUILD_ARTIFACT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.HOT_DEPLOY_ARTIFACT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.JAVA_HOME_ENV_VAR;
+import static fish.payara.eclipse.tools.micro.MicroConstants.UBER_JAR_BUILD_ARTIFACT;
+import static fish.payara.eclipse.tools.micro.MicroConstants.WAR_BUILD_ARTIFACT;
 import static org.eclipse.core.externaltools.internal.IExternalToolConstants.ATTR_BUILD_SCOPE;
 import static org.eclipse.core.externaltools.internal.IExternalToolConstants.ATTR_LOCATION;
 import static org.eclipse.core.externaltools.internal.IExternalToolConstants.ATTR_TOOL_ARGUMENTS;
@@ -61,8 +61,8 @@
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Text;
 
-import fish.payara.eclipse.micro.BuildTool;
-import fish.payara.eclipse.micro.ui.wizards.Messages;
+import fish.payara.eclipse.tools.micro.BuildTool;
+import fish.payara.eclipse.tools.micro.ui.wizards.Messages;
 
 public class MicroProjectTab extends AbstractJavaMainTab {
 
@@ -197,7 +197,7 @@ public void setDefaults(ILaunchConfigurationWorkingCopy config) {
 		} else {
 			config.setAttribute(ATTR_PROJECT_NAME, EMPTY_STRING);
 		}
-		config.setAttribute(DebugPlugin.ATTR_PROCESS_FACTORY_ID, "fish.payara.eclipse.micro.processFactory");
+		config.setAttribute(DebugPlugin.ATTR_PROCESS_FACTORY_ID, "fish.payara.eclipse.tools.micro.processFactory");
 	}
 
 	@Override

diff --git a/...ra/eclipse/micro/ui/wizards/Messages.java → ...ipse/tools/micro/ui/wizards/Messages.java b/...ra/eclipse/micro/ui/wizards/Messages.java → ...ipse/tools/micro/ui/wizards/Messages.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v20.html
  * SPDX-License-Identifier: EPL-2.0
  */
-package fish.payara.eclipse.micro.ui.wizards;
+package fish.payara.eclipse.tools.micro.ui.wizards;
 
 public class Messages extends org.eclipse.osgi.util.NLS {
 

diff --git a/...ipse/micro/ui/wizards/Messages.properties → ...ools/micro/ui/wizards/Messages.properties b/...ipse/micro/ui/wizards/Messages.properties → ...ools/micro/ui/wizards/Messages.properties
diff --git a/.../micro/ui/wizards/MicroProjectWizard.java → .../micro/ui/wizards/MicroProjectWizard.java b/.../micro/ui/wizards/MicroProjectWizard.java → .../micro/ui/wizards/MicroProjectWizard.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v20.html
  * SPDX-License-Identifier: EPL-2.0
  */
-package fish.payara.eclipse.micro.ui.wizards;
+package fish.payara.eclipse.tools.micro.ui.wizards;
 
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
@@ -79,7 +79,7 @@ public MicroProjectWizard() {
 	private static final String ARCHETYPE_JDK_VERSION = "jdkVersion"; //$NON-NLS-1$
 	private static final String ARCHETYPE_JDK_VERSION_DEFAULT_VALUE = "1.8"; //$NON-NLS-1$
 	public static final String ARCHETYPE_MICRO_VERSION = "payaraMicroVersion"; //$NON-NLS-1$
-	private static final String ARCHETYPE_MICRO_VERSION_DEFAULT_VALUE = "5.2020.5"; //$NON-NLS-1$
+	private static final String ARCHETYPE_MICRO_VERSION_DEFAULT_VALUE = "6.2022.2"; //$NON-NLS-1$
 	public static final String ARCHETYPE_AUTOBIND_HTTP = "autoBindHttp"; //$NON-NLS-1$
 	private static final String ARCHETYPE_CONCURRENT_API = "addConcurrentApi"; //$NON-NLS-1$
 	private static final String ARCHETYPE_RESOURCE_API = "addResourceApi"; //$NON-NLS-1$

diff --git a/...ro/ui/wizards/MicroProjectWizardPage.java → ...ro/ui/wizards/MicroProjectWizardPage.java b/...ro/ui/wizards/MicroProjectWizardPage.java → ...ro/ui/wizards/MicroProjectWizardPage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v20.html
  * SPDX-License-Identifier: EPL-2.0
  */
-package fish.payara.eclipse.micro.ui.wizards;
+package fish.payara.eclipse.tools.micro.ui.wizards;
 
 import java.util.regex.Pattern;
 

diff --git a/...o/ui/wizards/MicroSettingsWizardPage.java → ...o/ui/wizards/MicroSettingsWizardPage.java b/...o/ui/wizards/MicroSettingsWizardPage.java → ...o/ui/wizards/MicroSettingsWizardPage.java
@@ -7,11 +7,11 @@
  * http://www.eclipse.org/legal/epl-v20.html
  * SPDX-License-Identifier: EPL-2.0
  */
-package fish.payara.eclipse.micro.ui.wizards;
+package fish.payara.eclipse.tools.micro.ui.wizards;
 
-import static fish.payara.eclipse.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_AUTOBIND_HTTP;
-import static fish.payara.eclipse.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_CONTEXT_ROOT;
-import static fish.payara.eclipse.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_MICRO_VERSION;
+import static fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_AUTOBIND_HTTP;
+import static fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_CONTEXT_ROOT;
+import static fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_MICRO_VERSION;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.UnsupportedEncodingException;

diff --git a/bundles/fish.payara.eclipse.tools.server/.classpath 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>
diff --git a/bundles/fish.payara.eclipse.tools.server/.project b/bundles/fish.payara.eclipse.tools.server/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>fish.payara.eclipse.tools.server</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>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/...settings/org.eclipse.core.resources.prefs → ...settings/org.eclipse.core.resources.prefs b/...settings/org.eclipse.core.resources.prefs → ...settings/org.eclipse.core.resources.prefs
diff --git a/...ture/.settings/org.eclipse.m2e.core.prefs → ...rver/.settings/org.eclipse.m2e.core.prefs b/...ture/.settings/org.eclipse.m2e.core.prefs → ...rver/.settings/org.eclipse.m2e.core.prefs