Merge branch '2.x' of https://github.com/payara/ecosystem-eclipse-plugin into 2.x

Author: jGauravGupta

bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/PayaraServer.java

@@ -8,7 +8,7 @@
  ******************************************************************************/
 
 /******************************************************************************
- * Copyright (c) 2018-2022 Payara Foundation
+ * Copyright (c) 2018-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
@@ -492,7 +492,8 @@ private void setDebugArgument(ILaunchConfigurationWorkingCopy config, String key
 	 * @return true if ant publisher needs to publish.
 	 */
 	private boolean publishNeeded(int kind, int deltaKind, IModule[] module) {
-		if ((getServer().getServerPublishState() == PUBLISH_CLEAN) || (kind != PUBLISH_INCREMENTAL && kind != PUBLISH_AUTO) || (deltaKind != NO_CHANGE)) {
+		if ((getServer().getServerPublishState() == PUBLISH_CLEAN)
+				|| (kind != PUBLISH_INCREMENTAL && kind != PUBLISH_AUTO) || (deltaKind != NO_CHANGE)) {
 			return true;
 		}
 
@@ -531,13 +532,13 @@ private void publishModuleForPayara(int kind, int deltaKind, IModule[] module, I
 		Properties publishProperties = loadPublishProperties();
 
 		boolean isRemote = getPayaraServerDelegate().isRemote();
+		boolean isDockerInstance = getPayaraServerDelegate().isDockerInstance();
 		boolean isJarDeploy = getPayaraServerDelegate().getJarDeploy();
 
-		if ((!isRemote && !isJarDeploy)) {
+		if ((!isRemote && !isJarDeploy) || isDockerInstance) {
 			publishDeployedDirectory(kind, deltaKind, publishProperties, module, monitor);
 		} else {
 			publishJarFile(kind, deltaKind, publishProperties, module, monitor);
-
 		}
 
 		setModulePublishState(module, PUBLISH_STATE_NONE);
@@ -607,13 +608,17 @@ private void publishDeployedDirectory(int kind, int deltaKind, Properties publis
 				return;
 			}
 
-			IPath path = new Path(getPayaraServerDelegate().getDomainPath() + "/eclipseApps/" + module[0].getName());
-
 			// Using PublishHelper to control the temp area to be in the same file system of
 			// the deployed apps
 			// so that the move operation Eclipse is doing sometimes can work.
-			PublishHelper helper = new PublishHelper(
-					new Path(getPayaraServerDelegate().getDomainPath() + "/eclipseAppsTmp").toFile());
+			boolean dockerInstance = getPayaraServerDelegate().isDockerInstance();
+			String hostPath = getPayaraServerDelegate().getHostPath();
+			String containerPath = getPayaraServerDelegate().getContainerPath();
+
+			String parentPath = dockerInstance ? getPayaraServerDelegate().getHostPath()
+					: getPayaraServerDelegate().getDomainPath();
+			IPath path = new Path(parentPath + "/eclipseApps/" + module[0].getName());
+			PublishHelper helper = new PublishHelper(new Path(parentPath + "/eclipseAppsTmp").toFile());
 
 			AssembleModules assembler = new AssembleModules(module, path, getPayaraServerDelegate(), helper);
 			logMessage("Deploy direcotry " + path.toFile().getAbsolutePath());
@@ -675,7 +680,7 @@ private void publishDeployedDirectory(int kind, int deltaKind, Properties publis
 				CommandTarget command = null;
 				if (deltaKind == ADDED) {
 					command = new CommandDeploy(name, null, new File("" + path), contextRoot, properties, new File[0],
-							hotDeploy);
+							dockerInstance, hostPath, containerPath, hotDeploy);
 				} else {
 					command = new CommandRedeploy(name, null, contextRoot, properties, new File[0], keepSession,
 							hotDeploy, metadataChanged, sourcesChanged);
@@ -718,6 +723,10 @@ private void publishJarFile(int kind, int deltaKind, Properties p, IModule[] mod
 				String name = simplifyModuleID(module[0].getName());
 				String contextRoot = null;
 
+				boolean dockerInstance = getPayaraServerDelegate().isDockerInstance();
+				String hostPath = getPayaraServerDelegate().getHostPath();
+				String containerPath = getPayaraServerDelegate().getContainerPath();
+
 				if (isModuleType(module[0], "jst.web")) {
 					contextRoot = getContextRoot(module);
 				}
@@ -727,9 +736,9 @@ private void publishJarFile(int kind, int deltaKind, Properties p, IModule[] mod
 				boolean hotDeploy = getServer().getAttribute(PayaraServer.ATTR_HOTDEPLOY,
 						Boolean.parseBoolean(DEFAULT_HOT_DEPLOY));
 				try {
-					ServerAdmin
-							.executeOn(getPayaraServerDelegate()).command(new CommandDeploy(name, null, archivePath,
-									contextRoot, getDeploymentProperties(), new File[0], hotDeploy))
+					ServerAdmin.executeOn(getPayaraServerDelegate())
+							.command(new CommandDeploy(name, null, archivePath, contextRoot, getDeploymentProperties(),
+									new File[0], dockerInstance, hostPath, containerPath, hotDeploy))
 							.timeout(520).onNotCompleted(result -> {
 								logMessage("deploy is failing=" + result.getValue());
 								throw new IllegalStateException("deploy is failing=" + result.getValue());

bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/deploying/PayaraServerBehaviour.java

@@ -8,7 +8,7 @@
  ******************************************************************************/
 
 /******************************************************************************
- * Copyright (c) 2018-2022 Payara Foundation
+ * Copyright (c) 2018-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
@@ -68,8 +68,8 @@ public class CommandDeploy extends CommandTargetName {
 	public static ResultString deploy(PayaraServer server, File application, TaskStateListener listener)
 			throws PayaraIdeException {
 		try {
-			return ServerAdmin.<ResultString>exec(server,
-					new CommandDeploy(null, null, application, null, null, null, false), listener).get();
+			return ServerAdmin.<ResultString>exec(server, new CommandDeploy(null, null, application, null, null, null,
+					server.isDockerInstance(), server.getHostPath(), server.getContainerPath(), false), listener).get();
 		} catch (InterruptedException | ExecutionException | CancellationException ie) {
 			throw new PayaraIdeException(ERROR_MESSAGE, ie);
 		}
@@ -97,6 +97,15 @@ public static ResultString deploy(PayaraServer server, File application, TaskSta
 	/** Hot Deploy. */
 	final boolean hotDeploy;
 
+	/** Docker Instance. */
+	final boolean dockerInstance;
+
+	/** Host Path. */
+	final String hostPath;
+
+	/** Container Path. */
+	final String containerPath;
+
 	////////////////////////////////////////////////////////////////////////////
 	// Constructors //
 	////////////////////////////////////////////////////////////////////////////
@@ -105,24 +114,29 @@ public static ResultString deploy(PayaraServer server, File application, TaskSta
 	 * Constructs an instance of GlassFish server deploy command entity.
 	 * <p/>
 	 *
-	 * @param name        Name of module/cluster/instance to modify.
-	 * @param target      Target GlassFish instance or cluster where
-	 *                    <code>name</code> is stored.
-	 * @param path        File to deploy.
-	 * @param contextRoot Deployed application context root.
-	 * @param properties  Deployment properties.
-	 * @param libraries   Not used in actual deploy command.
-	 * @param hotDeploy   Hot Deploy.
+	 * @param name           Name of module/cluster/instance to modify.
+	 * @param target         Target GlassFish instance or cluster where
+	 *                       <code>name</code> is stored.
+	 * @param path           File to deploy.
+	 * @param contextRoot    Deployed application context root.
+	 * @param properties     Deployment properties.
+	 * @param libraries      Not used in actual deploy command.
+	 * @param dockerInstance Docker Instance.
+	 * @param hotDeploy      Hot Deploy.
 	 */
 	public CommandDeploy(String name, String target, File path, String contextRoot, Map<String, String> properties,
-			File[] libraries, final boolean hotDeploy) {
+			File[] libraries, final boolean dockerInstance, final String hostPath, final String containerPath,
+			final boolean hotDeploy) {
 		super(COMMAND, name, target);
 
 		this.path = path;
 		this.contextRoot = contextRoot;
 		this.properties = properties;
 		this.libraries = libraries;
 		this.dirDeploy = path.isDirectory();
+		this.dockerInstance = dockerInstance;
+		this.hostPath = hostPath;
+		this.containerPath = containerPath;
 		this.hotDeploy = hotDeploy;
 	}