This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 88dcee788e Add support for GlassFish 7.0.6 - Add support of the
MicroProfile REST Client - Add a new way to start GlassFish - Add support for
using @Inject to inject REST artifacts - Bug fixes and updates of various
components - Bump the GlassFish version in some tests
new de8dde74c1 Merge pull request #6221 from pepness/glassfish706
88dcee788e is described below
commit 88dcee788e4bca2aed58ae9f0d5b97352f90b107
Author: José Contreras <[email protected]>
AuthorDate: Tue Jul 18 17:24:03 2023 -0600
Add support for GlassFish 7.0.6
- Add support of the MicroProfile REST Client
- Add a new way to start GlassFish
- Add support for using @Inject to inject REST artifacts
- 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 | 8 ++++++-
.../glassfish/tooling/admin/AdminFactoryTest.java | 4 ++--
.../tooling/data/GlassFishVersionTest.java | 8 +++++--
.../glassfish/tooling/utils/EnumUtilsTest.java | 26 +++++++++++-----------
8 files changed, 53 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 ba40e9cd3e..7babce535c 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
@@ -172,6 +172,7 @@ 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
+STR_706_SERVER_NAME=GlassFish Server 7.0.6
# 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 36c0d30b05..0d8d14f6eb 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
@@ -356,6 +356,17 @@ public enum ServerDetails {
"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
+ ),
+
+ /**
+ * details for an instance of GlassFish Server 7.0.6
+ */
+ GLASSFISH_SERVER_7_0_6(NbBundle.getMessage(ServerDetails.class,
"STR_706_SERVER_NAME", new Object[]{}), // NOI18N
+ "deployer:gfv700ee10", // NOI18N
+ 706,
+
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.6/glassfish-7.0.6.zip";,
// NOI18N
+
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.6/glassfish-7.0.6.zip";,
// NOI18N
+ "http://www.eclipse.org/legal/epl-2.0"; //NOI18N
);
/**
@@ -367,6 +378,7 @@ public enum ServerDetails {
public static WizardDescriptor.InstantiatingIterator
getInstantiatingIterator() {
return new ServerWizardIterator(new ServerDetails[]{
+ GLASSFISH_SERVER_7_0_6,
GLASSFISH_SERVER_7_0_5,
GLASSFISH_SERVER_7_0_4,
GLASSFISH_SERVER_7_0_3,
@@ -396,6 +408,7 @@ public enum ServerDetails {
GLASSFISH_SERVER_3_0_1,
GLASSFISH_SERVER_3},
new ServerDetails[]{
+ GLASSFISH_SERVER_7_0_6,
GLASSFISH_SERVER_7_0_5,
GLASSFISH_SERVER_7_0_4,
GLASSFISH_SERVER_7_0_3,
@@ -466,6 +479,7 @@ public enum ServerDetails {
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();
+ case GF_7_0_6: return GLASSFISH_SERVER_7_0_6.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 201e3b688f..225cdf2101 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
@@ -98,6 +98,7 @@ public abstract class AdminFactory {
case GF_7_0_3:
case GF_7_0_4:
case GF_7_0_5:
+ case GF_7_0_6:
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 5ccaab5d22..f9a5d31992 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
@@ -108,7 +108,9 @@ public enum GlassFishVersion {
/** GlassFish 7.0.4 */
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);
+ GF_7_0_5 ((short) 7, (short) 0, (short) 5, (short) 0,
GlassFishVersion.GF_7_0_5_STR),
+ /** GlassFish 7.0.6 */
+ GF_7_0_6 ((short) 7, (short) 0, (short) 6, (short) 0,
GlassFishVersion.GF_7_0_6_STR);
////////////////////////////////////////////////////////////////////////////
// Class attributes
//
////////////////////////////////////////////////////////////////////////////
@@ -289,6 +291,11 @@ public enum GlassFishVersion {
/** 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"};
+ /** A {@code String} representation of GF_7_0_6 value. */
+ static final String GF_7_0_6_STR = "7.0.6";
+ /** Additional {@code String} representations of GF_7_0_6 value. */
+ static final String GF_7_0_6_STR_NEXT[] = {"7.0.6", "7.0.6.0"};
+
/**
* Stored <code>String</code> values for backward <code>String</code>
* conversion.
@@ -331,6 +338,7 @@ public enum GlassFishVersion {
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);
+ initStringValuesMapFromArray(GF_7_0_6, GF_7_0_6_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 1dcb933dc9..ff7c81b5cd 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
@@ -144,6 +144,11 @@ public class ConfigBuilderProvider {
= new Config.Next(GlassFishVersion.GF_7_0_5,
ConfigBuilderProvider.class.getResource("GlassFishV7_0_1.xml"));
+ /** Library builder configuration since GlassFish 7.0.6. */
+ private static final Config.Next CONFIG_V7_0_6
+ = new Config.Next(GlassFishVersion.GF_7_0_6,
+
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,
@@ -151,7 +156,8 @@ 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_5);
+ CONFIG_V7_0_3, CONFIG_V7_0_4, CONFIG_V7_0_5,
+ CONFIG_V7_0_6);
/** 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 848d303e6e..3295081409 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.5
+ * Test factory functionality for GlassFish v. 7.0.6
* <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_5);
+ srv.setVersion(GlassFishVersion.GF_7_0_6);
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 3cbe0ca08b..527ef5b604 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
@@ -109,6 +109,8 @@ public class GlassFishVersionTest {
GlassFishVersion.GF_7_0_4_STR_NEXT);
verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_5,
GlassFishVersion.GF_7_0_5_STR_NEXT);
+ verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_6,
+ GlassFishVersion.GF_7_0_6_STR_NEXT);
}
/**
@@ -132,7 +134,8 @@ 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_5
+ GlassFishVersion.GF_7_0_4, GlassFishVersion.GF_7_0_5,
+ GlassFishVersion.GF_7_0_6
};
String strings[] = {
"1.0.1.4", "2.0.1.5", "2.1.0.3", "2.1.1.7",
@@ -142,7 +145,8 @@ 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.5.0"
+ "7.0.2.0", "7.0.3.0", "7.0.4.0", "7.0.5.0",
+ "7.0.6.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 48b165348e..00c3e4e552 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_5;
+import static
org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_7_0_6;
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_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_7_0_6, GF_6_2_5), "Equals for a > b shall
be false.");
+ assertTrue(EnumUtils.eq(GF_7_0_6, GF_7_0_6), "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_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_7_0_6, GF_6_2_5), "Not equals for a > b
shall be true.");
+ assertFalse(EnumUtils.ne(GF_7_0_6, GF_7_0_6), "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_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_7_0_6, GF_6_2_5), "Less than for a > b
shall be false.");
+ assertFalse(EnumUtils.lt(GF_7_0_6, GF_7_0_6), "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_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_7_0_6, GF_6_2_5), "Less than or equal for
a > b shall be false.");
+ assertTrue(EnumUtils.le(GF_7_0_6, GF_7_0_6), "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_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_7_0_6, GF_6_2_5), "Greater than for a > b
shall be true.");
+ assertFalse(EnumUtils.gt(GF_7_0_6, GF_7_0_6), "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_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_7_0_6, GF_6_2_5), "Greater than or equal
for a > b shall be true.");
+ assertTrue(EnumUtils.ge(GF_7_0_6, GF_7_0_6), "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: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
