This is an automated email from the ASF dual-hosted git repository. pepness 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 6bcd0c9a14 Add support for GlassFish 7.0.5 - This is mainly a maintenance release that contains bug fixes and updates of various components - Bump the GlassFish version in some tests new 6af13f6a3e Merge pull request #6002 from pepness/glassfish-7.0.5 6bcd0c9a14 is described below commit 6bcd0c9a14af892d7222d1f142acb030e094ed15 Author: José Contreras <pepn...@apache.org> AuthorDate: Tue May 30 15:13:21 2023 -0600 Add support for GlassFish 7.0.5 - This is mainly a maintenance release that contains bug fixes and updates of various components - Bump the GlassFish version in some tests --- .../modules/glassfish/common/Bundle.properties | 1 + .../modules/glassfish/common/ServerDetails.java | 14 ++++++++++++ .../glassfish/tooling/admin/AdminFactory.java | 1 + .../glassfish/tooling/data/GlassFishVersion.java | 10 ++++++++- .../server/config/ConfigBuilderProvider.java | 7 +++++- .../glassfish/tooling/admin/AdminFactoryTest.java | 4 ++-- .../tooling/data/GlassFishVersionTest.java | 6 +++-- .../glassfish/tooling/utils/EnumUtilsTest.java | 26 +++++++++++----------- 8 files changed, 50 insertions(+), 19 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 8ad89e3c67..ba40e9cd3e 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 @@ -171,6 +171,7 @@ STR_701_SERVER_NAME=GlassFish Server 7.0.1 STR_702_SERVER_NAME=GlassFish Server 7.0.2 STR_703_SERVER_NAME=GlassFish Server 7.0.3 STR_704_SERVER_NAME=GlassFish Server 7.0.4 +STR_705_SERVER_NAME=GlassFish Server 7.0.5 # CommonServerSupport.java MSG_FLAKEY_NETWORK=<html>Network communication problem<br/>Could not establish \ 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 66eda85288..36c0d30b05 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 @@ -345,6 +345,17 @@ public enum ServerDetails { "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.4/glassfish-7.0.4.zip", // NOI18N "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.4/glassfish-7.0.4.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N + ), + + /** + * details for an instance of GlassFish Server 7.0.5 + */ + GLASSFISH_SERVER_7_0_5(NbBundle.getMessage(ServerDetails.class, "STR_705_SERVER_NAME", new Object[]{}), // NOI18N + "deployer:gfv700ee10", // NOI18N + 705, + "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.5/glassfish-7.0.5.zip", // NOI18N + "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.5/glassfish-7.0.5.zip", // NOI18N + "http://www.eclipse.org/legal/epl-2.0" //NOI18N ); /** @@ -356,6 +367,7 @@ public enum ServerDetails { public static WizardDescriptor.InstantiatingIterator getInstantiatingIterator() { return new ServerWizardIterator(new ServerDetails[]{ + GLASSFISH_SERVER_7_0_5, GLASSFISH_SERVER_7_0_4, GLASSFISH_SERVER_7_0_3, GLASSFISH_SERVER_7_0_2, @@ -384,6 +396,7 @@ public enum ServerDetails { GLASSFISH_SERVER_3_0_1, GLASSFISH_SERVER_3}, new ServerDetails[]{ + GLASSFISH_SERVER_7_0_5, GLASSFISH_SERVER_7_0_4, GLASSFISH_SERVER_7_0_3, GLASSFISH_SERVER_7_0_2, @@ -452,6 +465,7 @@ public enum ServerDetails { case GF_7_0_2: return GLASSFISH_SERVER_7_0_2.getVersion(); case GF_7_0_3: return GLASSFISH_SERVER_7_0_3.getVersion(); case GF_7_0_4: return GLASSFISH_SERVER_7_0_4.getVersion(); + case GF_7_0_5: return GLASSFISH_SERVER_7_0_5.getVersion(); default: return -1; } } diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java index 1945d149fc..201e3b688f 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java @@ -97,6 +97,7 @@ public abstract class AdminFactory { case GF_7_0_2: case GF_7_0_3: case GF_7_0_4: + case GF_7_0_5: return AdminFactoryRest.getInstance(); // Anything else is not unknown. default: 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 acec7ad2c1..5ccaab5d22 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 @@ -106,7 +106,9 @@ public enum GlassFishVersion { /** GlassFish 7.0.3 */ GF_7_0_3 ((short) 7, (short) 0, (short) 3, (short) 0, GlassFishVersion.GF_7_0_3_STR), /** GlassFish 7.0.4 */ - GF_7_0_4 ((short) 7, (short) 0, (short) 4, (short) 0, GlassFishVersion.GF_7_0_4_STR); + GF_7_0_4 ((short) 7, (short) 0, (short) 4, (short) 0, GlassFishVersion.GF_7_0_4_STR), + /** GlassFish 7.0.5 */ + GF_7_0_5 ((short) 7, (short) 0, (short) 5, (short) 0, GlassFishVersion.GF_7_0_5_STR); //////////////////////////////////////////////////////////////////////////// // Class attributes // //////////////////////////////////////////////////////////////////////////// @@ -282,6 +284,11 @@ public enum GlassFishVersion { /** Additional {@code String} representations of GF_7_0_4 value. */ static final String GF_7_0_4_STR_NEXT[] = {"7.0.4", "7.0.4.0"}; + /** A {@code String} representation of GF_7_0_5 value. */ + static final String GF_7_0_5_STR = "7.0.5"; + /** Additional {@code String} representations of GF_7_0_5 value. */ + static final String GF_7_0_5_STR_NEXT[] = {"7.0.5", "7.0.5.0"}; + /** * Stored <code>String</code> values for backward <code>String</code> * conversion. @@ -323,6 +330,7 @@ public enum GlassFishVersion { initStringValuesMapFromArray(GF_7_0_2, GF_7_0_2_STR_NEXT); initStringValuesMapFromArray(GF_7_0_3, GF_7_0_3_STR_NEXT); initStringValuesMapFromArray(GF_7_0_4, GF_7_0_4_STR_NEXT); + initStringValuesMapFromArray(GF_7_0_5, GF_7_0_5_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 5c4b8838b9..1dcb933dc9 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 @@ -139,6 +139,11 @@ public class ConfigBuilderProvider { = new Config.Next(GlassFishVersion.GF_7_0_4, ConfigBuilderProvider.class.getResource("GlassFishV7_0_1.xml")); + /** Library builder configuration since GlassFish 7.0.5. */ + private static final Config.Next CONFIG_V7_0_5 + = new Config.Next(GlassFishVersion.GF_7_0_5, + ConfigBuilderProvider.class.getResource("GlassFishV7_0_1.xml")); + /** Library builder configuration for GlassFish cloud. */ private static final Config config = new Config(CONFIG_V3, CONFIG_V4, CONFIG_V4_1, CONFIG_V5, @@ -146,7 +151,7 @@ public class ConfigBuilderProvider { CONFIG_V6_2_0, CONFIG_V6_2_1, CONFIG_V6_2_2, CONFIG_V6_2_3, CONFIG_V6_2_4, CONFIG_V6_2_5, CONFIG_V7_0_0, CONFIG_V7_0_1, CONFIG_V7_0_2, - CONFIG_V7_0_3, CONFIG_V7_0_4); + CONFIG_V7_0_3, CONFIG_V7_0_4, CONFIG_V7_0_5); /** Builders array for each server instance. */ private static final Map<GlassFishServer, ConfigBuilder> builders 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 8661781a7e..848d303e6e 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 @@ -168,7 +168,7 @@ public class AdminFactoryTest extends CommandTest { } /** - * Test factory functionality for GlassFish v. 7.0.4 + * Test factory functionality for GlassFish v. 7.0.5 * <p/> * Factory should initialize REST {@code Runner} and point it to * provided {@code Command} instance. @@ -176,7 +176,7 @@ public class AdminFactoryTest extends CommandTest { @Test public void testGetInstanceforVersionGF7() { GlassFishServerEntity srv = new GlassFishServerEntity(); - srv.setVersion(GlassFishVersion.GF_7_0_4); + srv.setVersion(GlassFishVersion.GF_7_0_5); 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 1b402f5dd1..3cbe0ca08b 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 @@ -107,6 +107,8 @@ public class GlassFishVersionTest { GlassFishVersion.GF_7_0_3_STR_NEXT); verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_4, GlassFishVersion.GF_7_0_4_STR_NEXT); + verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_5, + GlassFishVersion.GF_7_0_5_STR_NEXT); } /** @@ -130,7 +132,7 @@ public class GlassFishVersionTest { GlassFishVersion.GF_6_2_4, GlassFishVersion.GF_6_2_5, GlassFishVersion.GF_7_0_0, GlassFishVersion.GF_7_0_1, GlassFishVersion.GF_7_0_2, GlassFishVersion.GF_7_0_3, - GlassFishVersion.GF_7_0_4 + GlassFishVersion.GF_7_0_4, GlassFishVersion.GF_7_0_5 }; String strings[] = { "1.0.1.4", "2.0.1.5", "2.1.0.3", "2.1.1.7", @@ -140,7 +142,7 @@ public class GlassFishVersionTest { "5.0.1.0", "5.1.0.0", "6.0.0.0", "6.1.0.0", "6.2.0.0", "6.2.1.0", "6.2.2.0", "6.2.3.0", "6.2.4.0", "6.2.5.0", "7.0.0.0", "7.0.1.0", - "7.0.2.0", "7.0.3.0", "7.0.4.0" + "7.0.2.0", "7.0.3.0", "7.0.4.0", "7.0.5.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 21c304f65f..48b165348e 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 @@ package org.netbeans.modules.glassfish.tooling.utils; 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_4; +import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_7_0_5; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import org.testng.annotations.Test; @@ -47,8 +47,8 @@ public class EnumUtilsTest { */ @Test public void testEq() { - assertFalse(EnumUtils.eq(GF_7_0_4, GF_6_2_5), "Equals for a > b shall be false."); - assertTrue(EnumUtils.eq(GF_7_0_4, GF_7_0_4), "Equals for a == b shall be true."); + assertFalse(EnumUtils.eq(GF_7_0_5, GF_6_2_5), "Equals for a > b shall be false."); + assertTrue(EnumUtils.eq(GF_7_0_5, GF_7_0_5), "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."); @@ -69,8 +69,8 @@ public class EnumUtilsTest { */ @Test public void testNe() { - assertTrue(EnumUtils.ne(GF_7_0_4, GF_6_2_5), "Not equals for a > b shall be true."); - assertFalse(EnumUtils.ne(GF_7_0_4, GF_7_0_4), "Not equals for a == b shall be false."); + assertTrue(EnumUtils.ne(GF_7_0_5, GF_6_2_5), "Not equals for a > b shall be true."); + assertFalse(EnumUtils.ne(GF_7_0_5, GF_7_0_5), "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."); @@ -91,8 +91,8 @@ public class EnumUtilsTest { */ @Test public void testLt() { - assertFalse(EnumUtils.lt(GF_7_0_4, GF_6_2_5), "Less than for a > b shall be false."); - assertFalse(EnumUtils.lt(GF_7_0_4, GF_7_0_4), "Less than for a == b shall be false."); + assertFalse(EnumUtils.lt(GF_7_0_5, GF_6_2_5), "Less than for a > b shall be false."); + assertFalse(EnumUtils.lt(GF_7_0_5, GF_7_0_5), "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."); @@ -113,8 +113,8 @@ public class EnumUtilsTest { */ @Test public void testLe() { - assertFalse(EnumUtils.le(GF_7_0_4, GF_6_2_5), "Less than or equal for a > b shall be false."); - assertTrue(EnumUtils.le(GF_7_0_4, GF_7_0_4), "Less than or equal for a == b shall be true."); + assertFalse(EnumUtils.le(GF_7_0_5, GF_6_2_5), "Less than or equal for a > b shall be false."); + assertTrue(EnumUtils.le(GF_7_0_5, GF_7_0_5), "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."); @@ -135,8 +135,8 @@ public class EnumUtilsTest { */ @Test public void testGt() { - assertTrue(EnumUtils.gt(GF_7_0_4, GF_6_2_5), "Greater than for a > b shall be true."); - assertFalse(EnumUtils.gt(GF_7_0_4, GF_7_0_4), "Greater than for a == b shall be false."); + assertTrue(EnumUtils.gt(GF_7_0_5, GF_6_2_5), "Greater than for a > b shall be true."); + assertFalse(EnumUtils.gt(GF_7_0_5, GF_7_0_5), "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."); @@ -157,8 +157,8 @@ public class EnumUtilsTest { */ @Test public void testGe() { - assertTrue(EnumUtils.ge(GF_7_0_4, GF_6_2_5), "Greater than or equal for a > b shall be true."); - assertTrue(EnumUtils.ge(GF_7_0_4, GF_7_0_4), "Greater than or equal for a == b shall be true."); + assertTrue(EnumUtils.ge(GF_7_0_5, GF_6_2_5), "Greater than or equal for a > b shall be true."); + assertTrue(EnumUtils.ge(GF_7_0_5, GF_7_0_5), "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."); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists