Skip to content

Commit a40cb0b

Browse files
authored
Merge pull request #89 from luiseufrasio/FISH-10316-run-fails-p5
FISH-10316 : setting start command to p5 version
2 parents c0361da + 35c0271 commit a40cb0b

3 files changed

Lines changed: 10 additions & 2 deletions

File tree

bundles/fish.payara.eclipse.tools.micro/src/fish/payara/eclipse/tools/micro/MavenBuildTool.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
public class MavenBuildTool extends BuildTool {
2626

27+
public static String START_COMMAND = "dev";
2728
private static final String PLUGIN = " fish.payara.maven.plugins:payara-micro-maven-plugin:";
2829

2930
public MavenBuildTool(IProject project) {
@@ -89,7 +90,7 @@ public List<String> getStartCommand(String contextPath, String microVersion, Str
8990
} else {
9091
commands.add("package");
9192
}
92-
commands.add(PLUGIN + "dev");
93+
commands.add(PLUGIN + START_COMMAND);
9394
if (contextPath != null && !contextPath.trim().isEmpty()) {
9495
commands.add("-DcontextRoot=" + contextPath);
9596
}
@@ -122,4 +123,8 @@ public List<String> getReloadCommand(boolean hotDeploy, List<String> sourcesChan
122123
}
123124
return commands;
124125
}
126+
127+
public static void setStartCommand(String cmd) {
128+
START_COMMAND = cmd;
129+
}
125130
}

bundles/fish.payara.eclipse.tools.micro/src/fish/payara/eclipse/tools/micro/ui/wizards/MicroProjectWizard.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public MicroProjectWizard() {
8989

9090
public static final String ARCHETYPE_GROUP_ID = "fish.payara.maven.archetypes"; //$NON-NLS-1$
9191
public static final String ARCHETYPE_ARTIFACT_ID = "payara-micro-maven-archetype"; //$NON-NLS-1$
92-
public static final String ARCHETYPE_VERSION_5X = "1.4.0"; //$NON-NLS-1$
92+
public static final String ARCHETYPE_VERSION_5X = "1.5.0"; //$NON-NLS-1$
9393
public static final String STARTER_ARCHETYPE_GROUP_ID = "fish.payara.starter";
9494
public static final String STARTER_ARCHETYPE_ARTIFACT_ID = "payara-starter-archetype";
9595
public static final String ARCHETYPE_VERSION_6X = "1.0-beta9"; //$NON-NLS-1$

bundles/fish.payara.eclipse.tools.micro/src/fish/payara/eclipse/tools/micro/ui/wizards/MicroSettingsWizardPage.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
import org.eclipse.swt.widgets.Composite;
3737
import org.eclipse.swt.widgets.Label;
3838

39+
import fish.payara.eclipse.tools.micro.MavenBuildTool;
40+
3941
public class MicroSettingsWizardPage extends AbstractMavenWizardPage {
4042

4143
private Combo contextPathCombo;
@@ -136,6 +138,7 @@ public Archetype getArchetype() {
136138
archetype.setGroupId(ARCHETYPE_GROUP_ID);
137139
archetype.setArtifactId(ARCHETYPE_ARTIFACT_ID);
138140
archetype.setVersion(ARCHETYPE_VERSION_5X);
141+
MavenBuildTool.setStartCommand("start");
139142
} else {
140143
archetype.setGroupId(STARTER_ARCHETYPE_GROUP_ID);
141144
archetype.setArtifactId(STARTER_ARCHETYPE_ARTIFACT_ID);

0 commit comments

Comments
 (0)