From 405489de11067020894aae45701c9bc1a0a546ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Contreras?= Date: Sun, 31 Aug 2025 11:28:48 -0600 Subject: [PATCH] Add support for GlassFish 7.0.25, and GlassFish 8.0.0-M12 --- .../glassfish/common/Bundle.properties | 1 + .../glassfish/common/ServerDetails.java | 15 +++++++- .../common/wizards/Bundle.properties | 1 + .../tooling/data/GlassFishVersion.java | 8 ++++ .../server/config/ConfigBuilderProvider.java | 11 ++++-- .../tooling/server/config/GlassFishV8_0_0.xml | 2 +- .../tooling/admin/AdminFactoryTest.java | 4 +- .../tooling/data/GlassFishVersionTest.java | 8 +++- .../tooling/utils/EnumUtilsTest.java | 38 +++++++++---------- 9 files changed, 59 insertions(+), 29 deletions(-) diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties index 14f36052bef8..a135021e5c38 100644 --- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties +++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties @@ -191,6 +191,7 @@ STR_7021_SERVER_NAME=GlassFish Server 7.0.21 STR_7022_SERVER_NAME=GlassFish Server 7.0.22 STR_7023_SERVER_NAME=GlassFish Server 7.0.23 STR_7024_SERVER_NAME=GlassFish Server 7.0.24 +STR_7025_SERVER_NAME=GlassFish Server 7.0.25 STR_800_SERVER_NAME=GlassFish Server 8.0.0 # CommonServerSupport.java diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java index 8e20700173fd..2d955f5fe9a2 100644 --- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java +++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java @@ -555,6 +555,17 @@ public enum ServerDetails { "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.24/glassfish-7.0.24.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N ), + + /** + * details for an instance of GlassFish Server 7.0.24 + */ + GLASSFISH_SERVER_7_0_25(NbBundle.getMessage(ServerDetails.class, "STR_7025_SERVER_NAME", new Object[]{}), // NOI18N + GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_7_0_25, + "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.25/glassfish-7.0.25.zip", // NOI18N + "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.25/glassfish-7.0.25.zip", // NOI18N + "http://www.eclipse.org/legal/epl-2.0" //NOI18N + ), /** * details for an instance of GlassFish Server 8.0.0 @@ -562,8 +573,8 @@ public enum ServerDetails { GLASSFISH_SERVER_8_0_0(NbBundle.getMessage(ServerDetails.class, "STR_800_SERVER_NAME", new Object[]{}), // NOI18N GlassfishInstanceProvider.JAKARTAEE11_DEPLOYER_FRAGMENT, GlassFishVersion.GF_8_0_0, - "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M11/glassfish-8.0.0-M11.zip", // NOI18N - "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M11/glassfish-8.0.0-M11.zip", // NOI18N + "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M12/glassfish-8.0.0-M12.zip", // NOI18N + "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M12/glassfish-8.0.0-M12.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N ); diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties index fc552f4e4265..8cfeab56094b 100644 --- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties +++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties @@ -192,6 +192,7 @@ STR_7021_SERVER_NAME=GlassFish Server 7.0.21 STR_7022_SERVER_NAME=GlassFish Server 7.0.22 STR_7023_SERVER_NAME=GlassFish Server 7.0.23 STR_7024_SERVER_NAME=GlassFish Server 7.0.24 +STR_7025_SERVER_NAME=GlassFish Server 7.0.25 STR_V8_FAMILY_NAME=GlassFish Server STR_800_SERVER_NAME=GlassFish Server 8.0.0 diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java index 201e68414b4f..2b3a5e5557c3 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java @@ -144,6 +144,8 @@ public enum GlassFishVersion { GF_7_0_23 ((short) 7, (short) 0, (short) 23, (short) 0, GlassFishVersion.GF_7_0_23_STR), /** GlassFish 7.0.24 */ GF_7_0_24 ((short) 7, (short) 0, (short) 24, (short) 0, GlassFishVersion.GF_7_0_24_STR), + /** GlassFish 7.0.25 */ + GF_7_0_25 ((short) 7, (short) 0, (short) 25, (short) 0, GlassFishVersion.GF_7_0_25_STR), /** GlassFish 8.0.0 */ GF_8_0_0 ((short) 8, (short) 0, (short) 0, (short) 0, GlassFishVersion.GF_8_0_0_STR); // Class attributes // @@ -417,6 +419,11 @@ public enum GlassFishVersion { static final String GF_7_0_24_STR = "7.0.24"; /** Additional {@code String} representations of GF_7_0_24 value. */ static final String GF_7_0_24_STR_NEXT[] = {"7.0.24", "7.0.24.0"}; + + /** A {@code String} representation of GF_7_0_25 value. */ + static final String GF_7_0_25_STR = "7.0.25"; + /** Additional {@code String} representations of GF_7_0_25 value. */ + static final String GF_7_0_25_STR_NEXT[] = {"7.0.25", "7.0.25.0"}; /** A {@code String} representation of GF_8_0_0 value. */ static final String GF_8_0_0_STR = "8.0.0"; @@ -484,6 +491,7 @@ public enum GlassFishVersion { initStringValuesMapFromArray(GF_7_0_22, GF_7_0_22_STR_NEXT); initStringValuesMapFromArray(GF_7_0_23, GF_7_0_23_STR_NEXT); initStringValuesMapFromArray(GF_7_0_24, GF_7_0_24_STR_NEXT); + initStringValuesMapFromArray(GF_7_0_25, GF_7_0_25_STR_NEXT); initStringValuesMapFromArray(GF_8_0_0, GF_8_0_0_STR_NEXT); } diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java index 5a3391818fb9..4870dd20f690 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java @@ -235,6 +235,11 @@ public class ConfigBuilderProvider { private static final Config.Next CONFIG_V7_0_24 = new Config.Next(GlassFishVersion.GF_7_0_24, ConfigBuilderProvider.class.getResource("GlassFishV7_0_24.xml")); + + /** Library builder configuration since GlassFish 7.0.25. */ + private static final Config.Next CONFIG_V7_0_25 + = new Config.Next(GlassFishVersion.GF_7_0_25, + ConfigBuilderProvider.class.getResource("GlassFishV7_0_24.xml")); /** Library builder configuration since GlassFish 8.0.0. */ private static final Config.Next CONFIG_V8_0_0 @@ -255,13 +260,13 @@ public class ConfigBuilderProvider { CONFIG_V7_0_15, CONFIG_V7_0_16, CONFIG_V7_0_17, CONFIG_V7_0_18, CONFIG_V7_0_19, CONFIG_V7_0_20, CONFIG_V7_0_21, CONFIG_V7_0_22, CONFIG_V7_0_23, - CONFIG_V7_0_24, CONFIG_V8_0_0); + CONFIG_V7_0_24, CONFIG_V7_0_24, CONFIG_V8_0_0); /** Builders array for each server instance. */ private static final ConcurrentMap builders - = new ConcurrentHashMap<>(32); + = new ConcurrentHashMap<>(64); - // Static methods // + // Static methods /** * Get library builder configuration for given GlassFish server version. *

diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV8_0_0.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV8_0_0.xml index f644f1c11938..553de53e5e5b 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV8_0_0.xml +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV8_0_0.xml @@ -70,7 +70,7 @@ - + diff --git a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java index e97aea58c63e..00574543aef4 100644 --- a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java +++ b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java @@ -165,7 +165,7 @@ public void testGetInstanceforVersionGF6() { } /** - * Test factory functionality for GlassFish v. 7.0.24 + * Test factory functionality for GlassFish v. 7.0.25 *

* Factory should initialize REST {@code Runner} and point it to * provided {@code Command} instance. @@ -173,7 +173,7 @@ public void testGetInstanceforVersionGF6() { @Test public void testGetInstanceforVersionGF7() { GlassFishServerEntity srv = new GlassFishServerEntity(); - srv.setVersion(GlassFishVersion.GF_7_0_24); + srv.setVersion(GlassFishVersion.GF_7_0_25); AdminFactory af = AdminFactory.getInstance(srv.getVersion()); assertTrue(af instanceof AdminFactoryRest); Command cmd = new CommandVersion(); diff --git a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java index a3ed089432ee..d4fb84497a1f 100644 --- a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java +++ b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java @@ -141,6 +141,8 @@ public void testToValue() { GlassFishVersion.GF_7_0_23_STR_NEXT); verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_24, GlassFishVersion.GF_7_0_24_STR_NEXT); + verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_25, + GlassFishVersion.GF_7_0_25_STR_NEXT); verifyToValueFromAdditionalArray(GlassFishVersion.GF_8_0_0, GlassFishVersion.GF_8_0_0_STR_NEXT); } @@ -176,7 +178,8 @@ public void testToValueIncomplete() { GlassFishVersion.GF_7_0_18, GlassFishVersion.GF_7_0_19, GlassFishVersion.GF_7_0_20, GlassFishVersion.GF_7_0_21, GlassFishVersion.GF_7_0_22, GlassFishVersion.GF_7_0_23, - GlassFishVersion.GF_7_0_24, GlassFishVersion.GF_8_0_0 + GlassFishVersion.GF_7_0_24, GlassFishVersion.GF_7_0_25, + GlassFishVersion.GF_8_0_0 }; String strings[] = { "1.0.1.4", "2.0.1.5", "2.1.0.3", "2.1.1.7", @@ -191,7 +194,8 @@ public void testToValueIncomplete() { "7.0.10.0", "7.0.11.0", "7.0.12.0", "7.0.13.0", "7.0.14.0", "7.0.15.0", "7.0.16.0", "7.0.17.0", "7.0.18.0", "7.0.19.0", "7.0.20.0", "7.0.21.0", - "7.0.22.0", "7.0.23.0", "7.0.24.0", "8.0.0.0" + "7.0.22.0", "7.0.23.0", "7.0.24.0", "7.0.25.0", + "8.0.0.0" }; for (int i = 0; i < versions.length; i++) { GlassFishVersion version = GlassFishVersion.toValue(strings[i]); diff --git a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtilsTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtilsTest.java index 66b38746c10b..9c28fd65aaec 100644 --- a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtilsTest.java +++ b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtilsTest.java @@ -21,7 +21,7 @@ import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_3; import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_4; import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_6_2_5; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_7_0_24; +import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_7_0_25; import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_8_0_0; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -48,10 +48,10 @@ public class EnumUtilsTest { */ @Test public void testEq() { - assertFalse(EnumUtils.eq(GF_8_0_0, GF_7_0_24), "Equals for a > b shall be false."); + assertFalse(EnumUtils.eq(GF_8_0_0, GF_7_0_25), "Equals for a > b shall be false."); assertTrue(EnumUtils.eq(GF_8_0_0, GF_8_0_0), "Equals for a == b shall be true."); - assertFalse(EnumUtils.eq(GF_7_0_24, GF_6_2_5), "Equals for a > b shall be false."); - assertTrue(EnumUtils.eq(GF_7_0_24, GF_7_0_24), "Equals for a == b shall be true."); + assertFalse(EnumUtils.eq(GF_7_0_25, GF_6_2_5), "Equals for a > b shall be false."); + assertTrue(EnumUtils.eq(GF_7_0_25, GF_7_0_25), "Equals for a == b shall be true."); assertFalse(EnumUtils.eq(GF_4, GF_3), "Equals for a > b shall be false."); assertTrue(EnumUtils.eq(GF_4, GF_4), "Equals for a == b shall be true."); assertFalse(EnumUtils.eq(GF_3, GF_4), "Equals for a < b shall be false."); @@ -72,10 +72,10 @@ public void testEq() { */ @Test public void testNe() { - assertTrue(EnumUtils.ne(GF_8_0_0, GF_7_0_24), "Not equals for a > b shall be true."); + assertTrue(EnumUtils.ne(GF_8_0_0, GF_7_0_25), "Not equals for a > b shall be true."); assertFalse(EnumUtils.ne(GF_8_0_0, GF_8_0_0), "Not equals for a == b shall be false."); - assertTrue(EnumUtils.ne(GF_7_0_24, GF_6_2_5), "Not equals for a > b shall be true."); - assertFalse(EnumUtils.ne(GF_7_0_24, GF_7_0_24), "Not equals for a == b shall be false."); + assertTrue(EnumUtils.ne(GF_7_0_25, GF_6_2_5), "Not equals for a > b shall be true."); + assertFalse(EnumUtils.ne(GF_7_0_25, GF_7_0_25), "Not equals for a == b shall be false."); assertTrue(EnumUtils.ne(GF_4, GF_3), "Not equals for a > b shall be true."); assertFalse(EnumUtils.ne(GF_4, GF_4), "Not equals for a == b shall be false."); assertTrue(EnumUtils.ne(GF_3, GF_4), "Not equals for a < b shall be true."); @@ -96,10 +96,10 @@ public void testNe() { */ @Test public void testLt() { - assertFalse(EnumUtils.lt(GF_8_0_0, GF_7_0_24), "Less than for a > b shall be false."); + assertFalse(EnumUtils.lt(GF_8_0_0, GF_7_0_25), "Less than for a > b shall be false."); assertFalse(EnumUtils.lt(GF_8_0_0, GF_8_0_0), "Less than for a == b shall be false."); - assertFalse(EnumUtils.lt(GF_7_0_24, GF_6_2_5), "Less than for a > b shall be false."); - assertFalse(EnumUtils.lt(GF_7_0_24, GF_7_0_24), "Less than for a == b shall be false."); + assertFalse(EnumUtils.lt(GF_7_0_25, GF_6_2_5), "Less than for a > b shall be false."); + assertFalse(EnumUtils.lt(GF_7_0_25, GF_7_0_25), "Less than for a == b shall be false."); assertFalse(EnumUtils.lt(GF_4, GF_3), "Less than for a > b shall be false."); assertFalse(EnumUtils.lt(GF_4, GF_4), "Less than for a == b shall be false."); assertTrue(EnumUtils.lt(GF_3, GF_4), "Less than for a < b shall be true."); @@ -120,10 +120,10 @@ public void testLt() { */ @Test public void testLe() { - assertFalse(EnumUtils.le(GF_8_0_0, GF_7_0_24), "Less than or equal for a > b shall be false."); + assertFalse(EnumUtils.le(GF_8_0_0, GF_7_0_25), "Less than or equal for a > b shall be false."); assertTrue(EnumUtils.le(GF_8_0_0, GF_8_0_0), "Less than or equal for a == b shall be true."); - assertFalse(EnumUtils.le(GF_7_0_24, GF_6_2_5), "Less than or equal for a > b shall be false."); - assertTrue(EnumUtils.le(GF_7_0_24, GF_7_0_24), "Less than or equal for a == b shall be true."); + assertFalse(EnumUtils.le(GF_7_0_25, GF_6_2_5), "Less than or equal for a > b shall be false."); + assertTrue(EnumUtils.le(GF_7_0_25, GF_7_0_25), "Less than or equal for a == b shall be true."); assertFalse(EnumUtils.le(GF_4, GF_3), "Less than or equal for a > b shall be false."); assertTrue(EnumUtils.le(GF_4, GF_4), "Less than or equal for a == b shall be true."); assertTrue(EnumUtils.le(GF_3, GF_4), "Less than or equal for a < b shall be true."); @@ -144,10 +144,10 @@ public void testLe() { */ @Test public void testGt() { - assertTrue(EnumUtils.gt(GF_8_0_0, GF_7_0_24), "Greater than for a > b shall be true."); + assertTrue(EnumUtils.gt(GF_8_0_0, GF_7_0_25), "Greater than for a > b shall be true."); assertFalse(EnumUtils.gt(GF_8_0_0, GF_8_0_0), "Greater than for a == b shall be false."); - assertTrue(EnumUtils.gt(GF_7_0_24, GF_6_2_5), "Greater than for a > b shall be true."); - assertFalse(EnumUtils.gt(GF_7_0_24, GF_7_0_24), "Greater than for a == b shall be false."); + assertTrue(EnumUtils.gt(GF_7_0_25, GF_6_2_5), "Greater than for a > b shall be true."); + assertFalse(EnumUtils.gt(GF_7_0_25, GF_7_0_25), "Greater than for a == b shall be false."); assertTrue(EnumUtils.gt(GF_4, GF_3), "Greater than for a > b shall be true."); assertFalse(EnumUtils.gt(GF_4, GF_4), "Greater than for a == b shall be false."); assertFalse(EnumUtils.gt(GF_3, GF_4), "Greater than for a < b shall be false."); @@ -168,10 +168,10 @@ public void testGt() { */ @Test public void testGe() { - assertTrue(EnumUtils.ge(GF_8_0_0, GF_7_0_24), "Greater than or equal for a > b shall be true."); + assertTrue(EnumUtils.ge(GF_8_0_0, GF_7_0_25), "Greater than or equal for a > b shall be true."); assertTrue(EnumUtils.ge(GF_8_0_0, GF_8_0_0), "Greater than or equal for a == b shall be true."); - assertTrue(EnumUtils.ge(GF_7_0_24, GF_6_2_5), "Greater than or equal for a > b shall be true."); - assertTrue(EnumUtils.ge(GF_7_0_24, GF_7_0_24), "Greater than or equal for a == b shall be true."); + assertTrue(EnumUtils.ge(GF_7_0_25, GF_6_2_5), "Greater than or equal for a > b shall be true."); + assertTrue(EnumUtils.ge(GF_7_0_25, GF_7_0_25), "Greater than or equal for a == b shall be true."); assertTrue(EnumUtils.ge(GF_4, GF_3), "Greater than or equal for a > b shall be true."); assertTrue(EnumUtils.ge(GF_4, GF_4), "Greater than or equal for a == b shall be true."); assertFalse(EnumUtils.ge(GF_3, GF_4), "Greater than or equal for a < b shall be false.");