You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ge...@apache.org on 2021/07/14 07:13:42 UTC
[netbeans] branch master updated: NETBEANS-5143 Fixes Maven web app
twice deployment issue
This is an automated email from the ASF dual-hosted git repository.
geertjan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 913a5cb NETBEANS-5143 Fixes Maven web app twice deployment issue
new 68b062d Merge pull request #3005 from jGauravGupta/NETBEANS-5143
913a5cb is described below
commit 913a5cbef1af55f7f7d9dd238034c470076f3b86
Author: Gaurav Gupta <ga...@payara.fish>
AuthorDate: Fri Jun 18 17:16:58 2021 +0530
NETBEANS-5143 Fixes Maven web app twice deployment issue
---
.../payara/micro/project/MicroActionsProvider.java | 36 +++++++++-------------
.../micro/project/MicroExecutionChecker.java | 10 ++----
.../payara/micro/project/MicroProjectHook.java | 4 ---
3 files changed, 18 insertions(+), 32 deletions(-)
diff --git a/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/MicroActionsProvider.java b/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/MicroActionsProvider.java
index d2db06e..9afc568 100644
--- a/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/MicroActionsProvider.java
+++ b/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/MicroActionsProvider.java
@@ -104,40 +104,34 @@ public class MicroActionsProvider implements MavenActionsProvider {
@Override
public RunConfig createConfigForDefaultAction(String actionName, Project project, Lookup lookup) {
MicroApplication microApplication = MicroApplication.getInstance(project);
- if (microApplication == null) {
- return project.getLookup()
- .lookup(J2eeActionsProvider.class)
- .createConfigForDefaultAction(actionName, project, lookup);
- }
- Preferences pref = getPreferences(project, MicroApplication.class, true);
- String microVersionText = pref.get(VERSION, "");
- RunConfig config = actionsProvider.createConfigForDefaultAction(actionName, project, lookup);
- if(!microVersionText.isEmpty()){
- config.setProperty("version.payara", microVersionText);
+ if (microApplication != null) {
+ Preferences pref = getPreferences(project, MicroApplication.class, true);
+ String microVersionText = pref.get(VERSION, "");
+ RunConfig config = actionsProvider.createConfigForDefaultAction(actionName, project, lookup);
+ if (!microVersionText.isEmpty()) {
+ config.setProperty("version.payara", microVersionText);
+ }
+ return config;
}
- return config;
+ return null;
}
@Override
public NetbeansActionMapping getMappingForAction(String actionName, Project project) {
MicroApplication microApplication = MicroApplication.getInstance(project);
- if (microApplication == null) {
- return project.getLookup()
- .lookup(J2eeActionsProvider.class)
- .getMappingForAction(actionName, project);
+ if (microApplication != null) {
+ return actionsProvider.getMappingForAction(actionName, project);
}
- return actionsProvider.getMappingForAction(actionName, project);
+ return null;
}
@Override
public boolean isActionEnable(String action, Project project, Lookup lookup) {
MicroApplication microApplication = MicroApplication.getInstance(project);
- if (microApplication == null) {
- return project.getLookup()
- .lookup(J2eeActionsProvider.class)
- .isActionEnable(action, project, lookup);
+ if (microApplication != null) {
+ return actionsProvider.isActionEnable(action, project, lookup);
}
- return actionsProvider.isActionEnable(action, project, lookup);
+ return false;
}
@Override
diff --git a/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/MicroExecutionChecker.java b/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/MicroExecutionChecker.java
index b786c09..871775a 100644
--- a/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/MicroExecutionChecker.java
+++ b/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/MicroExecutionChecker.java
@@ -51,7 +51,7 @@ import org.netbeans.spi.project.ProjectServiceProvider;
service = {
ExecutionResultChecker.class,
PrerequisitesChecker.class
- },
+ },
projectType = MAVEN_WAR_PROJECT_TYPE
)
public class MicroExecutionChecker extends ExecutionChecker {
@@ -87,13 +87,11 @@ public class MicroExecutionChecker extends ExecutionChecker {
if (microApplication != null) {
if (BUILD_ACTIONS.contains(config.getActionName())) {
microApplication.setBuilding(true, config.getActionName());
- }else if (RUN_ACTIONS.contains(config.getActionName())) {
+ } else if (RUN_ACTIONS.contains(config.getActionName())) {
microApplication.setRunning(true, config.getActionName());
}
- return true;
- } else {
- return super.checkRunConfig(config);
}
+ return true;
}
@Override
@@ -110,8 +108,6 @@ public class MicroExecutionChecker extends ExecutionChecker {
} else if (RUN_ACTIONS.contains(config.getActionName())) {
microApplication.setRunning(false);
}
- } else {
- super.executionResult(config, res, resultCode);
}
}
diff --git a/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/MicroProjectHook.java b/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/MicroProjectHook.java
index 0deb466..8b3dc1d 100644
--- a/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/MicroProjectHook.java
+++ b/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/MicroProjectHook.java
@@ -48,8 +48,6 @@ public class MicroProjectHook extends ProjectHookImpl {
if (MicroApplication.getInstance(project) != null) {
addDeployOnSaveManager(project);
updateMicroIcon();
- } else {
- super.projectOpened();
}
}
@@ -57,8 +55,6 @@ public class MicroProjectHook extends ProjectHookImpl {
public void projectClosed() {
if (MicroApplication.getInstance(project) != null) {
removeDeployOnSaveManager(project);
- } else {
- super.projectOpened();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists