Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FISH-6776 Payara Server tools for Eclipse IDE #57

Merged
merged 6 commits into from
Jan 2, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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-SymbolicName: fish.payara.eclipse.tools.micro;singleton:=true
Bundle-Version: 2.0.0.qualifier
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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand All @@ -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>
Expand All @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {

Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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$
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
17 changes: 17 additions & 0 deletions bundles/fish.payara.eclipse.tools.server/.classpath
Original file line number Diff line number Diff line change
@@ -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>
34 changes: 34 additions & 0 deletions bundles/fish.payara.eclipse.tools.server/.project
Original file line number Diff line number Diff line change
@@ -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>
Loading