Skip to content

FISH-8031 Add JDK Path field to Micro Project launch tab #103

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.

Sign up for GitHub

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

Open
jGauravGupta wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FISH-8031 Add JDK Path field to Micro Project launch tab #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...s/fish.payara.eclipse.tools.micro/src/fish/payara/eclipse/tools/micro/MavenBuildTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public List<String> getStartCommand(String contextPath, String microVersion, Str
commands.add("-DcontextRoot=" + contextPath);
}
if (microVersion != null && !microVersion.trim().isEmpty()) {
commands.add("-DpayaraVersion=" + microVersion);
commands.add("-Dpayara.micro.version=" + microVersion);
}
if (hotDeploy) {
commands.add("-DhotDeploy=true");
Expand Down
2 changes: 2 additions & 0 deletions ...s/fish.payara.eclipse.tools.micro/src/fish/payara/eclipse/tools/micro/MicroConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@ public interface MicroConstants {
String ATTR_PORT = "port";

String JAVA_HOME_ENV_VAR = "JAVA_HOME";
String PAYARA_JAVA_HOME_SYS_PROP = "payara.java.home";

String ATTR_CONTEXT_PATH = "contextPath";
String ATTR_MICRO_VERSION = "microVersion";
String ATTR_BUILD_ARTIFACT = "buildArtifact";
String ATTR_DEBUG_PORT = "debugPort";
String ATTR_RELOAD_ARTIFACT = "reloadArtifact";
String ATTR_JDK_PATH = "jdkPath";

String WAR_BUILD_ARTIFACT = "War";
String EXPLODED_WAR_BUILD_ARTIFACT = "Exploded War";
Expand Down
63 changes: 59 additions & 4 deletions ...sh.payara.eclipse.tools.micro/src/fish/payara/eclipse/tools/micro/ui/MicroProjectTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@
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_JDK_PATH;
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.PAYARA_JAVA_HOME_SYS_PROP;
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;
Expand All @@ -28,6 +30,7 @@
import static org.eclipse.debug.core.ILaunchManager.ATTR_ENVIRONMENT_VARIABLES;
import static org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME;

import java.io.File;
import java.io.FileNotFoundException;
import java.util.Collections;
import java.util.HashMap;
Expand All @@ -41,6 +44,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
Expand All @@ -55,10 +59,14 @@
import org.eclipse.m2e.core.ui.internal.MavenImages;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.DirectoryDialog;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Text;

Expand All @@ -67,7 +75,7 @@

public class MicroProjectTab extends AbstractJavaMainTab {

private Text contextPathText, debugPortText;
private Text contextPathText, debugPortText, jdkPathText;
private Combo microVersionText, buildArtifactCombo, reloadArtifactCombo;

@Override
Expand Down Expand Up @@ -102,6 +110,26 @@ public void createControl(Composite parent) {
reloadArtifactCombo.addModifyListener(getDefaultListener());
reloadArtifactCombo.setToolTipText(Messages.reloadArtifactComponentTooltip);

group = SWTFactory.createGroup(mainComposite, Messages.jdkPathComponentLabel, 2, 1, GridData.FILL_HORIZONTAL);
jdkPathText = SWTFactory.createSingleText(group, 1);
jdkPathText.addModifyListener(getDefaultListener());
Button jdkBrowse = new Button(group, SWT.PUSH);
jdkBrowse.setText("Browse...");
jdkBrowse.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
DirectoryDialog dialog = new DirectoryDialog(jdkPathText.getShell());
String current = jdkPathText.getText().trim();
if (!current.isEmpty()) {
dialog.setFilterPath(current);
}
String selected = dialog.open();
if (selected != null && !selected.isEmpty()) {
jdkPathText.setText(selected);
}
}
});

setControl(mainComposite);
}

Expand Down Expand Up @@ -151,6 +179,14 @@ private void updateMicroSettingsFromConfig(ILaunchConfiguration config) {
setErrorMessage(ce.getStatus().getMessage());
}
reloadArtifactCombo.setText(reloadType);

String jdkPath = EMPTY_STRING;
try {
jdkPath = config.getAttribute(ATTR_JDK_PATH, jdkPath);
} catch (CoreException ce) {
setErrorMessage(ce.getStatus().getMessage());
}
jdkPathText.setText(jdkPath);
}

public Image getImage() {
Expand Down Expand Up @@ -221,25 +257,31 @@ public void performApply(ILaunchConfigurationWorkingCopy config) {
if (debugPort.isEmpty()) {
debugPort = String.valueOf(DEFAULT_DEBUG_PORT);
}
String jdkPath = jdkPathText.getText().trim();
config.setAttribute(ATTR_CONTEXT_PATH, contextPathText.getText());
config.setAttribute(ATTR_MICRO_VERSION, microVersionText.getText());
config.setAttribute(ATTR_BUILD_ARTIFACT, buildArtifactCombo.getText());
config.setAttribute(ATTR_DEBUG_PORT, debugPort);
config.setAttribute(ATTR_RELOAD_ARTIFACT, reloadArtifactCombo.getText());
config.setAttribute(ATTR_JDK_PATH, jdkPath);
config.setAttribute(ATTR_PROJECT_NAME, projectName);
config.setAttribute(ATTR_WORKING_DIRECTORY, project.getLocation().toOSString());
config.setAttribute(ATTR_BUILD_SCOPE, "${projects:" + project.getName() + "}");
Map<String, String> env = config.getAttribute(ATTR_ENVIRONMENT_VARIABLES, Collections.emptyMap());
if (env.isEmpty()) {
config.setAttribute(ATTR_ENVIRONMENT_VARIABLES, env = new HashMap<>());
}
if (!env.containsKey(JAVA_HOME_ENV_VAR)) {
env.put(JAVA_HOME_ENV_VAR, getJavaHome(project));
}

config.setAttribute(ATTR_LOCATION, buildTool.getExecutableHome());
boolean hotDeploy = HOT_DEPLOY_ARTIFACT.equals(reloadArtifactCombo.getText());
List<String> startCmd = buildTool.getStartCommand(contextPathText.getText(), microVersionText.getText(),
buildArtifactCombo.getText(), debugPort, hotDeploy);
if (!jdkPath.isEmpty()) {
startCmd.add("-D" + PAYARA_JAVA_HOME_SYS_PROP + "=\"" + resolveJavaExecutable(jdkPath) + "\"");
env.remove(JAVA_HOME_ENV_VAR);
} else if (!env.containsKey(JAVA_HOME_ENV_VAR)) {
env.put(JAVA_HOME_ENV_VAR, getJavaHome(project));
}
config.setAttribute(ATTR_TOOL_ARGUMENTS, String.join(" ", startCmd));
}
} catch (FileNotFoundException ex) {
Expand All @@ -255,6 +297,19 @@ public static String getJavaHome(IProject project) throws CoreException {
return install.getInstallLocation().getAbsolutePath();
}

private static String resolveJavaExecutable(String jdkPath) {
File path = new File(jdkPath);
if (path.isFile()) {
return jdkPath;
}
boolean windows = Platform.OS_WIN32.equals(Platform.getOS());
String binary = windows ? "java.exe" : "java";
String base = path.getName().equalsIgnoreCase("bin")
? jdkPath
: jdkPath + File.separator + "bin";
return base + File.separator + binary;
}

@Override
public String getName() {
return Messages.microProjectTabTitle;
Expand Down
1 change: 1 addition & 0 deletions ...h.payara.eclipse.tools.micro/src/fish/payara/eclipse/tools/micro/ui/wizards/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,6 @@ public class Messages extends org.eclipse.osgi.util.NLS {
public static String debugPortComponentLabel;
public static String reloadArtifactComponentLabel;
public static String reloadArtifactComponentTooltip;
public static String jdkPathComponentLabel;

}
1 change: 1 addition & 0 deletions ...ra.eclipse.tools.micro/src/fish/payara/eclipse/tools/micro/ui/wizards/Messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ buildArtifactComponentLabel=Build Artifact
debugPortComponentLabel=Debug Port
reloadArtifactComponentLabel=Reload Artifact on save
reloadArtifactComponentTooltip=Reload Artifact feature is only available for Exploded War
jdkPathComponentLabel=JDK Path