Merge 1f4387a into 8495fb3

avojak · Oct 10, 2018 · 7d5e96a · 7d5e96a
2 parents 8495fb3 + 1f4387a
commit 7d5e96a
Show file tree

Hide file tree

Showing 30 changed files with 685 additions and 193 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,9 +4,9 @@
 .project
 .settings/
 
+com.avojak.plugin.hydrogen.lib/target/*
 com.avojak.plugin.hydrogen.core/target/*
 com.avojak.plugin.hydrogen.feature/target/*
 com.avojak.plugin.hydrogen.test/target/*
-com.avojak.plugin.hydrogen.test.dependencies/target/*
 com.avojak.plugin.hydrogen.test.report/target/*
 com.avojak.plugin.hydrogen.site/target/*
diff --git a/...hydrogen/core/contributions/configuration/launch/HydrogenLaunchConfigurationDelegate.java b/...hydrogen/core/contributions/configuration/launch/HydrogenLaunchConfigurationDelegate.java
@@ -1,6 +1,7 @@
 package com.avojak.plugin.hydrogen.core.contributions.configuration.launch;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Optional;
@@ -15,14 +16,11 @@
 import org.eclipse.jdt.launching.IVMRunner;
 import org.eclipse.jdt.launching.VMRunnerConfiguration;
 
-import com.avojak.plugin.hydrogen.core.contributions.configuration.launch.factory.FileFactory;
-import com.avojak.plugin.hydrogen.core.contributions.configuration.launch.factory.ServerSocketFactory;
-import com.avojak.plugin.hydrogen.core.contributions.configuration.launch.factory.VMRunnerConfigurationFactory;
 import com.avojak.plugin.hydrogen.core.contributions.configuration.launch.listener.HydrogenLaunchListener;
-import com.avojak.plugin.hydrogen.core.contributions.configuration.launch.wrapper.DebugPluginWrapper;
-import com.avojak.plugin.hydrogen.core.contributions.configuration.launch.wrapper.HydrogenActivatorWrapper;
-import com.avojak.plugin.hydrogen.core.contributions.configuration.launch.wrapper.JavaRuntimeWrapper;
 import com.avojak.plugin.hydrogen.core.contributions.preferencepage.PreferenceConstants;
+import com.avojak.plugin.hydrogen.core.factory.FileFactory;
+import com.avojak.plugin.hydrogen.core.factory.ServerSocketFactory;
+import com.avojak.plugin.hydrogen.core.factory.VMRunnerConfigurationFactory;
 import com.avojak.plugin.hydrogen.core.h2.model.ServerOption;
 import com.avojak.plugin.hydrogen.core.h2.model.arguments.PgServerArguments;
 import com.avojak.plugin.hydrogen.core.h2.model.arguments.PgServerArgumentsBuilder;
@@ -34,6 +32,10 @@
 import com.avojak.plugin.hydrogen.core.h2.model.arguments.WebServerArgumentsBuilder;
 import com.avojak.plugin.hydrogen.core.logging.HydrogenLoggerFactory;
 import com.avojak.plugin.hydrogen.core.logging.IHydrogenLogger;
+import com.avojak.plugin.hydrogen.core.util.EmbeddedExecutableLocator;
+import com.avojak.plugin.hydrogen.core.wrapper.DebugPluginWrapper;
+import com.avojak.plugin.hydrogen.core.wrapper.HydrogenActivatorWrapper;
+import com.avojak.plugin.hydrogen.core.wrapper.JavaRuntimeWrapper;
 
 /**
  * The Hydrogen launch configuration delegate.
@@ -48,6 +50,7 @@ public class HydrogenLaunchConfigurationDelegate extends AbstractJavaLaunchConfi
 	private static final String MAIN_SERVER_CLASS = "org.h2.tools.Server"; //$NON-NLS-1$
 	private static final String LAUNCH_HEADLESS = "-Djava.awt.headless=true"; //$NON-NLS-1$
 
+	private static final String EMBEDDED_EXECUTABLE_NOT_FOUND_ERROR = "The embedded H2 executable could not be found"; //$NON-NLS-1$
 	private static final String UNSET_EXECUTABLE_ERROR = "The executable location has not yet been set. " //$NON-NLS-1$
 			+ "Update the Hydrogen preferences and select the H2 executable before reattempting the launch."; //$NON-NLS-1$
 	private static final String EXECUTABLE_NOT_FILE_ERROR = "The specified H2 executable is not a file. " //$NON-NLS-1$
@@ -63,14 +66,15 @@ public class HydrogenLaunchConfigurationDelegate extends AbstractJavaLaunchConfi
 	private final FileFactory fileFactory;
 	private final VMRunnerConfigurationFactory vmRunnerConfigurationFactory;
 	private final ProgramArgumentsFactory programArgumentsFactory;
+	private final EmbeddedExecutableLocator executableLocator;
 	private final LaunchDelegatePortPool portPool;
 
 	/**
 	 * Constructor.
 	 */
 	public HydrogenLaunchConfigurationDelegate() {
 		this(new JavaRuntimeWrapper(), new DebugPluginWrapper(), new HydrogenActivatorWrapper(), new FileFactory(),
-				new VMRunnerConfigurationFactory(), new ProgramArgumentsFactory(),
+				new VMRunnerConfigurationFactory(), new ProgramArgumentsFactory(), new EmbeddedExecutableLocator(),
 				new LaunchDelegatePortPool(new LaunchDelegatePortAvailabilityChecker(new ServerSocketFactory()),
 						new ServerSocketFactory()));
 	}
@@ -90,19 +94,23 @@ public HydrogenLaunchConfigurationDelegate() {
 	 *            The {@link VMRunnerConfigurationFactory}.
 	 * @param programArgumentsFactory
 	 *            The {@link ProgramArgumentsFactory}.
+	 * @param executableLocator
+	 *            The {@link EmbeddedExecutableLocator}.
 	 * @param portPool
 	 *            The {@link LaunchDelegatePortPool}.
 	 */
 	public HydrogenLaunchConfigurationDelegate(final JavaRuntimeWrapper javaRuntimeWrapper,
 			final DebugPluginWrapper debugPluginWrapper, final HydrogenActivatorWrapper hydrogenActivatorWrapper,
 			final FileFactory fileFactory, final VMRunnerConfigurationFactory vmRunnerConfigurationFactory,
-			final ProgramArgumentsFactory programArgumentsFactory, final LaunchDelegatePortPool portPool) {
+			final ProgramArgumentsFactory programArgumentsFactory, final EmbeddedExecutableLocator executableLocator,
+			final LaunchDelegatePortPool portPool) {
 		this.javaRuntimeWrapper = javaRuntimeWrapper;
 		this.debugPluginWrapper = debugPluginWrapper;
 		this.hydrogenActivatorWrapper = hydrogenActivatorWrapper;
 		this.fileFactory = fileFactory;
 		this.vmRunnerConfigurationFactory = vmRunnerConfigurationFactory;
 		this.programArgumentsFactory = programArgumentsFactory;
+		this.executableLocator = executableLocator;
 		this.portPool = portPool;
 		getLaunchManager().addLaunchListener(new HydrogenLaunchListener(portPool));
 	}
@@ -124,12 +132,28 @@ public void launch(final ILaunchConfiguration configuration, final String mode,
 		final IVMInstall vm = verifyVMInstall(configuration);
 		final IVMRunner runner = vm.getVMRunner(mode);
 
-		final String executablePreference = hydrogenActivatorWrapper.getDefault().getPreferenceStore()
-				.getString(PreferenceConstants.P_EXECUTABLE);
-		validateExecutablePreference(executablePreference);
-		final File executable = fileFactory.create(executablePreference);
+		final boolean runExternalPreference = hydrogenActivatorWrapper.getDefault().getPreferenceStore()
+				.getBoolean(PreferenceConstants.P_RUN_EXTERNAL);
+		final String externalExecutablePreference = hydrogenActivatorWrapper.getDefault().getPreferenceStore()
+				.getString(PreferenceConstants.P_EXT_EXE_PATH);
+
+		File executable = null;
+		if (runExternalPreference) {
+			validateExecutablePreference(externalExecutablePreference);
+			executable = fileFactory.create(externalExecutablePreference);
+		} else {
+			try {
+				executable = fileFactory.create(executableLocator.locate());
+			} catch (final FileNotFoundException e) {
+				abort(EMBEDDED_EXECUTABLE_NOT_FOUND_ERROR, e, 0);
+			}
+		}
+
 		validateExecutable(executable);
 
+		// TODO: Should the executable be copied to a temp location instead of running
+		// from within the bundle?
+
 		final String workingDirectory = executable.getParent();
 		LOGGER.debug("Working directory: " + workingDirectory); //$NON-NLS-1$
 		final String executableName = executable.getName();

diff --git a/...drogen/core/contributions/configuration/launch/LaunchDelegatePortAvailabilityChecker.java b/...drogen/core/contributions/configuration/launch/LaunchDelegatePortAvailabilityChecker.java
@@ -3,7 +3,7 @@
 import java.io.IOException;
 import java.net.ServerSocket;
 
-import com.avojak.plugin.hydrogen.core.contributions.configuration.launch.factory.ServerSocketFactory;
+import com.avojak.plugin.hydrogen.core.factory.ServerSocketFactory;
 
 /**
  * <p>

diff --git a/...vojak/plugin/hydrogen/core/contributions/configuration/launch/LaunchDelegatePortPool.java b/...vojak/plugin/hydrogen/core/contributions/configuration/launch/LaunchDelegatePortPool.java
@@ -7,7 +7,7 @@
 import java.util.List;
 import java.util.Set;
 
-import com.avojak.plugin.hydrogen.core.contributions.configuration.launch.factory.ServerSocketFactory;
+import com.avojak.plugin.hydrogen.core.factory.ServerSocketFactory;
 import com.avojak.plugin.hydrogen.core.logging.HydrogenLoggerFactory;
 import com.avojak.plugin.hydrogen.core.logging.IHydrogenLogger;