Skip to content

Commit a48b7a8

Browse files
pepnesspepness
authored
Merge pull request #8779 from pepness/glassfish-8-m12
Add support for GlassFish 7.0.25, and GlassFish 8.0.0-M12
2 parents 349228c + 405489d commit a48b7a8

File tree

9 files changed

+59
-29
lines changed

9 files changed

+59
-29
lines changed

‎enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ STR_7021_SERVER_NAME=GlassFish Server 7.0.21
191191
STR_7022_SERVER_NAME=GlassFish Server 7.0.22
192192
STR_7023_SERVER_NAME=GlassFish Server 7.0.23
193193
STR_7024_SERVER_NAME=GlassFish Server 7.0.24
194+
STR_7025_SERVER_NAME=GlassFish Server 7.0.25
194195
STR_800_SERVER_NAME=GlassFish Server 8.0.0
195196

196197
# CommonServerSupport.java

‎enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -555,15 +555,26 @@ public enum ServerDetails {
555555
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.24/glassfish-7.0.24.zip", // NOI18N
556556
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
557557
),
558+
559+
/**
560+
* details for an instance of GlassFish Server 7.0.24
561+
*/
562+
GLASSFISH_SERVER_7_0_25(NbBundle.getMessage(ServerDetails.class, "STR_7025_SERVER_NAME", new Object[]{}), // NOI18N
563+
GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT,
564+
GlassFishVersion.GF_7_0_25,
565+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.25/glassfish-7.0.25.zip", // NOI18N
566+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.25/glassfish-7.0.25.zip", // NOI18N
567+
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
568+
),
558569

559570
/**
560571
* details for an instance of GlassFish Server 8.0.0
561572
*/
562573
GLASSFISH_SERVER_8_0_0(NbBundle.getMessage(ServerDetails.class, "STR_800_SERVER_NAME", new Object[]{}), // NOI18N
563574
GlassfishInstanceProvider.JAKARTAEE11_DEPLOYER_FRAGMENT,
564575
GlassFishVersion.GF_8_0_0,
565-
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M11/glassfish-8.0.0-M11.zip", // NOI18N
566-
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M11/glassfish-8.0.0-M11.zip", // NOI18N
576+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M12/glassfish-8.0.0-M12.zip", // NOI18N
577+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M12/glassfish-8.0.0-M12.zip", // NOI18N
567578
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
568579
);
569580

‎enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ STR_7021_SERVER_NAME=GlassFish Server 7.0.21
192192
STR_7022_SERVER_NAME=GlassFish Server 7.0.22
193193
STR_7023_SERVER_NAME=GlassFish Server 7.0.23
194194
STR_7024_SERVER_NAME=GlassFish Server 7.0.24
195+
STR_7025_SERVER_NAME=GlassFish Server 7.0.25
195196

196197
STR_V8_FAMILY_NAME=GlassFish Server
197198
STR_800_SERVER_NAME=GlassFish Server 8.0.0

‎enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ public enum GlassFishVersion {
144144
GF_7_0_23 ((short) 7, (short) 0, (short) 23, (short) 0, GlassFishVersion.GF_7_0_23_STR),
145145
/** GlassFish 7.0.24 */
146146
GF_7_0_24 ((short) 7, (short) 0, (short) 24, (short) 0, GlassFishVersion.GF_7_0_24_STR),
147+
/** GlassFish 7.0.25 */
148+
GF_7_0_25 ((short) 7, (short) 0, (short) 25, (short) 0, GlassFishVersion.GF_7_0_25_STR),
147149
/** GlassFish 8.0.0 */
148150
GF_8_0_0 ((short) 8, (short) 0, (short) 0, (short) 0, GlassFishVersion.GF_8_0_0_STR);
149151
// Class attributes //
@@ -417,6 +419,11 @@ public enum GlassFishVersion {
417419
static final String GF_7_0_24_STR = "7.0.24";
418420
/** Additional {@code String} representations of GF_7_0_24 value. */
419421
static final String GF_7_0_24_STR_NEXT[] = {"7.0.24", "7.0.24.0"};
422+
423+
/** A {@code String} representation of GF_7_0_25 value. */
424+
static final String GF_7_0_25_STR = "7.0.25";
425+
/** Additional {@code String} representations of GF_7_0_25 value. */
426+
static final String GF_7_0_25_STR_NEXT[] = {"7.0.25", "7.0.25.0"};
420427

421428
/** A {@code String} representation of GF_8_0_0 value. */
422429
static final String GF_8_0_0_STR = "8.0.0";
@@ -484,6 +491,7 @@ public enum GlassFishVersion {
484491
initStringValuesMapFromArray(GF_7_0_22, GF_7_0_22_STR_NEXT);
485492
initStringValuesMapFromArray(GF_7_0_23, GF_7_0_23_STR_NEXT);
486493
initStringValuesMapFromArray(GF_7_0_24, GF_7_0_24_STR_NEXT);
494+
initStringValuesMapFromArray(GF_7_0_25, GF_7_0_25_STR_NEXT);
487495
initStringValuesMapFromArray(GF_8_0_0, GF_8_0_0_STR_NEXT);
488496
}
489497

‎enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,11 @@ public class ConfigBuilderProvider {
235235
private static final Config.Next CONFIG_V7_0_24
236236
= new Config.Next(GlassFishVersion.GF_7_0_24,
237237
ConfigBuilderProvider.class.getResource("GlassFishV7_0_24.xml"));
238+
239+
/** Library builder configuration since GlassFish 7.0.25. */
240+
private static final Config.Next CONFIG_V7_0_25
241+
= new Config.Next(GlassFishVersion.GF_7_0_25,
242+
ConfigBuilderProvider.class.getResource("GlassFishV7_0_24.xml"));
238243

239244
/** Library builder configuration since GlassFish 8.0.0. */
240245
private static final Config.Next CONFIG_V8_0_0
@@ -255,13 +260,13 @@ public class ConfigBuilderProvider {
255260
CONFIG_V7_0_15, CONFIG_V7_0_16, CONFIG_V7_0_17,
256261
CONFIG_V7_0_18, CONFIG_V7_0_19, CONFIG_V7_0_20,
257262
CONFIG_V7_0_21, CONFIG_V7_0_22, CONFIG_V7_0_23,
258-
CONFIG_V7_0_24, CONFIG_V8_0_0);
263+
CONFIG_V7_0_24, CONFIG_V7_0_24, CONFIG_V8_0_0);
259264

260265
/** Builders array for each server instance. */
261266
private static final ConcurrentMap<GlassFishServer, ConfigBuilder> builders
262-
= new ConcurrentHashMap<>(32);
267+
= new ConcurrentHashMap<>(64);
263268

264-
// Static methods //
269+
// Static methods
265270
/**
266271
* Get library builder configuration for given GlassFish server version.
267272
* <p/>

‎enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV8_0_0.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</fileset>
7171
</classpath>
7272
<javadocs>
73-
<link url="https://repo.maven.apache.org/maven2/org/glassfish/jersey/jersey-documentation/4.0.0-M2/jersey-documentation-4.0.0-M2-docbook.zip"/>
73+
<link url="https://repo.maven.apache.org/maven2/org/glassfish/jersey/jersey-documentation/4.0.0-M3/jersey-documentation-4.0.0-M3-docbook.zip"/>
7474
</javadocs>
7575
<sources>
7676
</sources>

‎enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,15 @@ public void testGetInstanceforVersionGF6() {
165165
}
166166

167167
/**
168-
* Test factory functionality for GlassFish v. 7.0.24
168+
* Test factory functionality for GlassFish v. 7.0.25
169169
* <p/>
170170
* Factory should initialize REST {@code Runner} and point it to
171171
* provided {@code Command} instance.
172172
*/
173173
@Test
174174
public void testGetInstanceforVersionGF7() {
175175
GlassFishServerEntity srv = new GlassFishServerEntity();
176-
srv.setVersion(GlassFishVersion.GF_7_0_24);
176+
srv.setVersion(GlassFishVersion.GF_7_0_25);
177177
AdminFactory af = AdminFactory.getInstance(srv.getVersion());
178178
assertTrue(af instanceof AdminFactoryRest);
179179
Command cmd = new CommandVersion();

‎enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ public void testToValue() {
141141
GlassFishVersion.GF_7_0_23_STR_NEXT);
142142
verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_24,
143143
GlassFishVersion.GF_7_0_24_STR_NEXT);
144+
verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_25,
145+
GlassFishVersion.GF_7_0_25_STR_NEXT);
144146
verifyToValueFromAdditionalArray(GlassFishVersion.GF_8_0_0,
145147
GlassFishVersion.GF_8_0_0_STR_NEXT);
146148
}
@@ -176,7 +178,8 @@ public void testToValueIncomplete() {
176178
GlassFishVersion.GF_7_0_18, GlassFishVersion.GF_7_0_19,
177179
GlassFishVersion.GF_7_0_20, GlassFishVersion.GF_7_0_21,
178180
GlassFishVersion.GF_7_0_22, GlassFishVersion.GF_7_0_23,
179-
GlassFishVersion.GF_7_0_24, GlassFishVersion.GF_8_0_0
181+
GlassFishVersion.GF_7_0_24, GlassFishVersion.GF_7_0_25,
182+
GlassFishVersion.GF_8_0_0
180183
};
181184
String strings[] = {
182185
"1.0.1.4", "2.0.1.5", "2.1.0.3", "2.1.1.7",
@@ -191,7 +194,8 @@ public void testToValueIncomplete() {
191194
"7.0.10.0", "7.0.11.0", "7.0.12.0", "7.0.13.0",
192195
"7.0.14.0", "7.0.15.0", "7.0.16.0", "7.0.17.0",
193196
"7.0.18.0", "7.0.19.0", "7.0.20.0", "7.0.21.0",
194-
"7.0.22.0", "7.0.23.0", "7.0.24.0", "8.0.0.0"
197+
"7.0.22.0", "7.0.23.0", "7.0.24.0", "7.0.25.0",
198+
"8.0.0.0"
195199
};
196200
for (int i = 0; i < versions.length; i++) {
197201
GlassFishVersion version = GlassFishVersion.toValue(strings[i]);

‎enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtilsTest.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_3;
2222
import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_4;
2323
import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_6_2_5;
24-
import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_7_0_24;
24+
import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_7_0_25;
2525
import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_8_0_0;
2626
import static org.testng.Assert.assertFalse;
2727
import static org.testng.Assert.assertTrue;
@@ -48,10 +48,10 @@ public class EnumUtilsTest {
4848
*/
4949
@Test
5050
public void testEq() {
51-
assertFalse(EnumUtils.eq(GF_8_0_0, GF_7_0_24), "Equals for a > b shall be false.");
51+
assertFalse(EnumUtils.eq(GF_8_0_0, GF_7_0_25), "Equals for a > b shall be false.");
5252
assertTrue(EnumUtils.eq(GF_8_0_0, GF_8_0_0), "Equals for a == b shall be true.");
53-
assertFalse(EnumUtils.eq(GF_7_0_24, GF_6_2_5), "Equals for a > b shall be false.");
54-
assertTrue(EnumUtils.eq(GF_7_0_24, GF_7_0_24), "Equals for a == b shall be true.");
53+
assertFalse(EnumUtils.eq(GF_7_0_25, GF_6_2_5), "Equals for a > b shall be false.");
54+
assertTrue(EnumUtils.eq(GF_7_0_25, GF_7_0_25), "Equals for a == b shall be true.");
5555
assertFalse(EnumUtils.eq(GF_4, GF_3), "Equals for a > b shall be false.");
5656
assertTrue(EnumUtils.eq(GF_4, GF_4), "Equals for a == b shall be true.");
5757
assertFalse(EnumUtils.eq(GF_3, GF_4), "Equals for a < b shall be false.");
@@ -72,10 +72,10 @@ public void testEq() {
7272
*/
7373
@Test
7474
public void testNe() {
75-
assertTrue(EnumUtils.ne(GF_8_0_0, GF_7_0_24), "Not equals for a > b shall be true.");
75+
assertTrue(EnumUtils.ne(GF_8_0_0, GF_7_0_25), "Not equals for a > b shall be true.");
7676
assertFalse(EnumUtils.ne(GF_8_0_0, GF_8_0_0), "Not equals for a == b shall be false.");
77-
assertTrue(EnumUtils.ne(GF_7_0_24, GF_6_2_5), "Not equals for a > b shall be true.");
78-
assertFalse(EnumUtils.ne(GF_7_0_24, GF_7_0_24), "Not equals for a == b shall be false.");
77+
assertTrue(EnumUtils.ne(GF_7_0_25, GF_6_2_5), "Not equals for a > b shall be true.");
78+
assertFalse(EnumUtils.ne(GF_7_0_25, GF_7_0_25), "Not equals for a == b shall be false.");
7979
assertTrue(EnumUtils.ne(GF_4, GF_3), "Not equals for a > b shall be true.");
8080
assertFalse(EnumUtils.ne(GF_4, GF_4), "Not equals for a == b shall be false.");
8181
assertTrue(EnumUtils.ne(GF_3, GF_4), "Not equals for a < b shall be true.");
@@ -96,10 +96,10 @@ public void testNe() {
9696
*/
9797
@Test
9898
public void testLt() {
99-
assertFalse(EnumUtils.lt(GF_8_0_0, GF_7_0_24), "Less than for a > b shall be false.");
99+
assertFalse(EnumUtils.lt(GF_8_0_0, GF_7_0_25), "Less than for a > b shall be false.");
100100
assertFalse(EnumUtils.lt(GF_8_0_0, GF_8_0_0), "Less than for a == b shall be false.");
101-
assertFalse(EnumUtils.lt(GF_7_0_24, GF_6_2_5), "Less than for a > b shall be false.");
102-
assertFalse(EnumUtils.lt(GF_7_0_24, GF_7_0_24), "Less than for a == b shall be false.");
101+
assertFalse(EnumUtils.lt(GF_7_0_25, GF_6_2_5), "Less than for a > b shall be false.");
102+
assertFalse(EnumUtils.lt(GF_7_0_25, GF_7_0_25), "Less than for a == b shall be false.");
103103
assertFalse(EnumUtils.lt(GF_4, GF_3), "Less than for a > b shall be false.");
104104
assertFalse(EnumUtils.lt(GF_4, GF_4), "Less than for a == b shall be false.");
105105
assertTrue(EnumUtils.lt(GF_3, GF_4), "Less than for a < b shall be true.");
@@ -120,10 +120,10 @@ public void testLt() {
120120
*/
121121
@Test
122122
public void testLe() {
123-
assertFalse(EnumUtils.le(GF_8_0_0, GF_7_0_24), "Less than or equal for a > b shall be false.");
123+
assertFalse(EnumUtils.le(GF_8_0_0, GF_7_0_25), "Less than or equal for a > b shall be false.");
124124
assertTrue(EnumUtils.le(GF_8_0_0, GF_8_0_0), "Less than or equal for a == b shall be true.");
125-
assertFalse(EnumUtils.le(GF_7_0_24, GF_6_2_5), "Less than or equal for a > b shall be false.");
126-
assertTrue(EnumUtils.le(GF_7_0_24, GF_7_0_24), "Less than or equal for a == b shall be true.");
125+
assertFalse(EnumUtils.le(GF_7_0_25, GF_6_2_5), "Less than or equal for a > b shall be false.");
126+
assertTrue(EnumUtils.le(GF_7_0_25, GF_7_0_25), "Less than or equal for a == b shall be true.");
127127
assertFalse(EnumUtils.le(GF_4, GF_3), "Less than or equal for a > b shall be false.");
128128
assertTrue(EnumUtils.le(GF_4, GF_4), "Less than or equal for a == b shall be true.");
129129
assertTrue(EnumUtils.le(GF_3, GF_4), "Less than or equal for a < b shall be true.");
@@ -144,10 +144,10 @@ public void testLe() {
144144
*/
145145
@Test
146146
public void testGt() {
147-
assertTrue(EnumUtils.gt(GF_8_0_0, GF_7_0_24), "Greater than for a > b shall be true.");
147+
assertTrue(EnumUtils.gt(GF_8_0_0, GF_7_0_25), "Greater than for a > b shall be true.");
148148
assertFalse(EnumUtils.gt(GF_8_0_0, GF_8_0_0), "Greater than for a == b shall be false.");
149-
assertTrue(EnumUtils.gt(GF_7_0_24, GF_6_2_5), "Greater than for a > b shall be true.");
150-
assertFalse(EnumUtils.gt(GF_7_0_24, GF_7_0_24), "Greater than for a == b shall be false.");
149+
assertTrue(EnumUtils.gt(GF_7_0_25, GF_6_2_5), "Greater than for a > b shall be true.");
150+
assertFalse(EnumUtils.gt(GF_7_0_25, GF_7_0_25), "Greater than for a == b shall be false.");
151151
assertTrue(EnumUtils.gt(GF_4, GF_3), "Greater than for a > b shall be true.");
152152
assertFalse(EnumUtils.gt(GF_4, GF_4), "Greater than for a == b shall be false.");
153153
assertFalse(EnumUtils.gt(GF_3, GF_4), "Greater than for a < b shall be false.");
@@ -168,10 +168,10 @@ public void testGt() {
168168
*/
169169
@Test
170170
public void testGe() {
171-
assertTrue(EnumUtils.ge(GF_8_0_0, GF_7_0_24), "Greater than or equal for a > b shall be true.");
171+
assertTrue(EnumUtils.ge(GF_8_0_0, GF_7_0_25), "Greater than or equal for a > b shall be true.");
172172
assertTrue(EnumUtils.ge(GF_8_0_0, GF_8_0_0), "Greater than or equal for a == b shall be true.");
173-
assertTrue(EnumUtils.ge(GF_7_0_24, GF_6_2_5), "Greater than or equal for a > b shall be true.");
174-
assertTrue(EnumUtils.ge(GF_7_0_24, GF_7_0_24), "Greater than or equal for a == b shall be true.");
173+
assertTrue(EnumUtils.ge(GF_7_0_25, GF_6_2_5), "Greater than or equal for a > b shall be true.");
174+
assertTrue(EnumUtils.ge(GF_7_0_25, GF_7_0_25), "Greater than or equal for a == b shall be true.");
175175
assertTrue(EnumUtils.ge(GF_4, GF_3), "Greater than or equal for a > b shall be true.");
176176
assertTrue(EnumUtils.ge(GF_4, GF_4), "Greater than or equal for a == b shall be true.");
177177
assertFalse(EnumUtils.ge(GF_3, GF_4), "Greater than or equal for a < b shall be false.");

0 commit comments

Comments
 (0)