Skip to content

Commit fa8123b

Browse files
jGauravGuptajGauravGupta
authored
Merge pull request #62 from jGauravGupta/FISH-7083
FISH-7083 Eclipse IDE support Maven Archetype 1.x/2.x release binary for respective Payara Micro 5.x/6.x
2 parents 1870ce5 + c5adf4b commit fa8123b

8 files changed

Lines changed: 43 additions & 15 deletions

File tree

‎bundles/fish.payara.eclipse.tools.micro/src/fish/payara/eclipse/tools/micro/ui/MicroProjectTab.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*/
1010
package fish.payara.eclipse.tools.micro.ui;
1111

12+
import static fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_MICRO_VERSIONS;
1213
import static fish.payara.eclipse.tools.micro.MicroConstants.ATTR_BUILD_ARTIFACT;
1314
import static fish.payara.eclipse.tools.micro.MicroConstants.ATTR_CONTEXT_PATH;
1415
import static fish.payara.eclipse.tools.micro.MicroConstants.ATTR_DEBUG_PORT;
@@ -66,8 +67,8 @@
6667

6768
public class MicroProjectTab extends AbstractJavaMainTab {
6869

69-
private Text contextPathText, microVersionText, debugPortText;
70-
private Combo buildArtifactCombo, reloadArtifactCombo;
70+
private Text contextPathText, debugPortText;
71+
private Combo microVersionText, buildArtifactCombo, reloadArtifactCombo;
7172

7273
@Override
7374
public void createControl(Composite parent) {
@@ -81,7 +82,7 @@ public void createControl(Composite parent) {
8182

8283
group = SWTFactory.createGroup(mainComposite, Messages.microVersionComponentLabel, 1, 1,
8384
GridData.FILL_HORIZONTAL);
84-
microVersionText = SWTFactory.createSingleText(group, 1);
85+
microVersionText = SWTFactory.createCombo(group, SWT.READ_ONLY, 1, ARCHETYPE_MICRO_VERSIONS);
8586
microVersionText.addModifyListener(getDefaultListener());
8687

8788
group = SWTFactory.createGroup(mainComposite, Messages.buildArtifactComponentLabel, 1, 1,

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

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515

1616
import java.util.ArrayList;
1717
import java.util.Collection;
18+
import java.util.HashMap;
1819
import java.util.List;
20+
import java.util.Map;
1921
import java.util.Properties;
2022

2123
import org.apache.maven.archetype.catalog.Archetype;
@@ -75,11 +77,22 @@ public MicroProjectWizard() {
7577

7678
private static final String ARCHETYPE_GROUP_ID = "fish.payara.maven.archetypes"; //$NON-NLS-1$
7779
private static final String ARCHETYPE_ARTIFACT_ID = "payara-micro-maven-archetype"; //$NON-NLS-1$
78-
private static final String ARCHETYPE_VERSION = "1.3.0"; //$NON-NLS-1$
80+
public static final String ARCHETYPE_VERSION_5X = "1.4.0"; //$NON-NLS-1$
81+
public static final String ARCHETYPE_VERSION_6X = "2.0"; //$NON-NLS-1$
7982
private static final String ARCHETYPE_JDK_VERSION = "jdkVersion"; //$NON-NLS-1$
8083
private static final String ARCHETYPE_JDK_VERSION_DEFAULT_VALUE = "1.8"; //$NON-NLS-1$
8184
public static final String ARCHETYPE_MICRO_VERSION = "payaraMicroVersion"; //$NON-NLS-1$
82-
private static final String ARCHETYPE_MICRO_VERSION_DEFAULT_VALUE = "6.2022.2"; //$NON-NLS-1$
85+
private static final String ARCHETYPE_MICRO_VERSION_DEFAULT_VALUE = "6.2023.2"; //$NON-NLS-1$
86+
public static final String[] ARCHETYPE_MICRO_VERSIONS = new String[]{"6.2023.2", "6.2023.1", "6.2022.2", "6.2022.1",
87+
"5.2022.5", "5.2022.4", "5.2022.3",
88+
"5.2022.2", "5.2022.1", "5.2021.10",
89+
"5.2021.9", "5.2021.8", "5.2021.7",
90+
"5.2021.6", "5.2021.5", "5.2021.4",
91+
"5.2021.3", "5.2021.2", "5.2021.1",
92+
"5.2020.7", "5.2020.6", "5.2020.5",
93+
"5.2020.4", "5.2020.3", "5.2020.2",
94+
"5.201", "5.194", "5.193.1", "5.192",
95+
"5.191", "5.184", "5.183", "5.182", "5.181"}; //$NON-NLS-1$
8396
public static final String ARCHETYPE_AUTOBIND_HTTP = "autoBindHttp"; //$NON-NLS-1$
8497
private static final String ARCHETYPE_CONCURRENT_API = "addConcurrentApi"; //$NON-NLS-1$
8598
private static final String ARCHETYPE_RESOURCE_API = "addResourceApi"; //$NON-NLS-1$
@@ -123,7 +136,7 @@ private Archetype getArchetype() {
123136
Archetype archetype = new Archetype();
124137
archetype.setGroupId(ARCHETYPE_GROUP_ID);
125138
archetype.setArtifactId(ARCHETYPE_ARTIFACT_ID);
126-
archetype.setVersion(ARCHETYPE_VERSION);
139+
archetype.setVersion(ARCHETYPE_VERSION_6X);
127140
Properties properties = new Properties();
128141
properties.put(ARCHETYPE_JDK_VERSION, ARCHETYPE_JDK_VERSION_DEFAULT_VALUE);
129142
properties.put(ARCHETYPE_MICRO_VERSION, ARCHETYPE_MICRO_VERSION_DEFAULT_VALUE);
@@ -147,7 +160,8 @@ public boolean performFinish() {
147160
final String artifactId = projectSettingsPage.getArtifactId();
148161
final String version = projectSettingsPage.getVersion();
149162
final String javaPackage = projectSettingsPage.getJavaPackage();
150-
final Properties properties = microSettingsPage.getProperties();
163+
final Map<String, String> properties = microSettingsPage.getProperties();
164+
151165
final IPath location = projectLocationPage.isInWorkspace() ? null : projectLocationPage.getLocationPath();
152166
final String projectName = getProjectName(importConfiguration, groupId, artifactId, version);
153167
final IWorkspace workspace = ResourcesPlugin.getWorkspace();
@@ -170,7 +184,7 @@ protected List<IProject> doCreateMavenProjects(IProgressMonitor monitor) throws
170184
ArchetypePlugin archetypeManager = org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator
171185
.getDefault().getArchetypePlugin();
172186
ArchetypeGenerator generator = archetypeManager.getGenerator();
173-
187+
//createArchetypeProjects(IPath location, IArchetype archetype, String groupId, String artifactId, String version, String javaPackage, Map<String, String> properties, IProgressMonitor monitor) throws CoreException {
174188
Collection<MavenProjectInfo> projects = generator.createArchetypeProjects(
175189
location, new MavenArchetype(archetype), groupId, artifactId, version, javaPackage, properties,
176190
monitor);

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,16 @@
1212
import static fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_AUTOBIND_HTTP;
1313
import static fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_CONTEXT_ROOT;
1414
import static fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_MICRO_VERSION;
15+
import static fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_MICRO_VERSIONS;
16+
import static fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_VERSION_5X;
17+
import static fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_VERSION_6X;
1518
import static java.nio.charset.StandardCharsets.UTF_8;
1619

1720
import java.io.UnsupportedEncodingException;
1821
import java.net.URLEncoder;
22+
import java.util.Map;
1923
import java.util.Properties;
24+
import java.util.stream.Collectors;
2025

2126
import org.apache.maven.archetype.catalog.Archetype;
2227
import org.eclipse.m2e.core.project.ProjectImportConfiguration;
@@ -69,9 +74,9 @@ private void createUI(Composite parent) {
6974

7075
microVersionCombo = new Combo(parent, SWT.BORDER);
7176
microVersionCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 2, 1));
72-
addFieldWithHistory(ARCHETYPE_MICRO_VERSION, microVersionCombo);
7377
microVersionCombo.setData("name", ARCHETYPE_MICRO_VERSION); //$NON-NLS-1$
7478
microVersionCombo.addModifyListener(e -> validate());
79+
microVersionCombo.setItems(ARCHETYPE_MICRO_VERSIONS);
7580

7681
Label autobindLabel = new Label(parent, SWT.NONE);
7782
autobindLabel.setText(Messages.autobindComponentLabel);
@@ -124,11 +129,19 @@ private String validateInput() {
124129
}
125130

126131
public Archetype getArchetype() {
132+
String[] versionToken = microVersionCombo.getText().trim().split("\\.");
133+
archetype.setVersion(versionToken.length > 1 && Integer.parseInt(versionToken[0]) < 6 ? ARCHETYPE_VERSION_5X : ARCHETYPE_VERSION_6X);
127134
return archetype;
128135
}
129136

130-
public Properties getProperties() {
131-
Properties properties = archetype.getProperties();
137+
public Map<String, String> getProperties() {
138+
Map<String, String> properties = archetype.getProperties()
139+
.entrySet().stream().collect(
140+
Collectors.toMap(
141+
e -> e.getKey().toString(),
142+
e -> e.getValue().toString()
143+
)
144+
);
132145
String contextRoot = contextPathCombo.getText().trim();
133146
try {
134147
contextRoot = contextRoot.startsWith("/") ? '/' + URLEncoder.encode(contextRoot.substring(1), UTF_8.name())

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<properties>
1616
<tycho.version>3.0.1</tycho.version>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18-
<eclipse.target>20229</eclipse.target>
19-
<eclipse-repo.url>https://download.eclipse.org/releases/2022-09</eclipse-repo.url>
18+
<eclipse.target>202212</eclipse.target>
19+
<eclipse-repo.url>https://download.eclipse.org/releases/2022-12</eclipse-repo.url>
2020
</properties>
2121

2222
<modules>

releng/fish.payara.eclipse.20229/.project renamed to releng/fish.payara.eclipse.202212/.project

File renamed without changes.

releng/fish.payara.eclipse.20229/fish.payara.eclipse.20229.target renamed to releng/fish.payara.eclipse.202212/fish.payara.eclipse.202212.target

File renamed without changes.

releng/fish.payara.eclipse.20229/pom.xml renamed to releng/fish.payara.eclipse.202212/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<version>2.1.0</version>
1111
</parent>
1212

13-
<artifactId>fish.payara.eclipse.20229</artifactId>
13+
<artifactId>fish.payara.eclipse.202212</artifactId>
1414
<packaging>eclipse-target-definition</packaging>
1515
</project>

‎releng/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</parent>
1414

1515
<modules>
16-
<module>fish.payara.eclipse.20229</module>
16+
<module>fish.payara.eclipse.202212</module>
1717
<module>fish.payara.eclipse.update</module>
1818
</modules>
1919
</project>

0 commit comments

Comments
 (0)