Skip to content

Commit c691834

Browse files
pepnesspepness
committed
Add support for upto GlassFish 7.0.24 and GlassFish 8.0.0-M11
1 parent 92eb77d commit c691834

File tree

10 files changed

+212
-27
lines changed

10 files changed

+212
-27
lines changed

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

+3
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,9 @@ STR_7018_SERVER_NAME=GlassFish Server 7.0.18
188188
STR_7019_SERVER_NAME=GlassFish Server 7.0.19
189189
STR_7020_SERVER_NAME=GlassFish Server 7.0.20
190190
STR_7021_SERVER_NAME=GlassFish Server 7.0.21
191+
STR_7022_SERVER_NAME=GlassFish Server 7.0.22
192+
STR_7023_SERVER_NAME=GlassFish Server 7.0.23
193+
STR_7024_SERVER_NAME=GlassFish Server 7.0.24
191194
STR_800_SERVER_NAME=GlassFish Server 8.0.0
192195

193196
# CommonServerSupport.java

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

+35-2
Original file line numberDiff line numberDiff line change
@@ -523,14 +523,47 @@ public enum ServerDetails {
523523
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
524524
),
525525

526+
/**
527+
* details for an instance of GlassFish Server 7.0.22
528+
*/
529+
GLASSFISH_SERVER_7_0_22(NbBundle.getMessage(ServerDetails.class, "STR_7022_SERVER_NAME", new Object[]{}), // NOI18N
530+
GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT,
531+
GlassFishVersion.GF_7_0_22,
532+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.22/glassfish-7.0.22.zip", // NOI18N
533+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.22/glassfish-7.0.22.zip", // NOI18N
534+
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
535+
),
536+
537+
/**
538+
* details for an instance of GlassFish Server 7.0.23
539+
*/
540+
GLASSFISH_SERVER_7_0_23(NbBundle.getMessage(ServerDetails.class, "STR_7023_SERVER_NAME", new Object[]{}), // NOI18N
541+
GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT,
542+
GlassFishVersion.GF_7_0_23,
543+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.23/glassfish-7.0.23.zip", // NOI18N
544+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.23/glassfish-7.0.23.zip", // NOI18N
545+
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
546+
),
547+
548+
/**
549+
* details for an instance of GlassFish Server 7.0.24
550+
*/
551+
GLASSFISH_SERVER_7_0_24(NbBundle.getMessage(ServerDetails.class, "STR_7024_SERVER_NAME", new Object[]{}), // NOI18N
552+
GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT,
553+
GlassFishVersion.GF_7_0_24,
554+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.24/glassfish-7.0.24.zip", // NOI18N
555+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.24/glassfish-7.0.24.zip", // NOI18N
556+
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
557+
),
558+
526559
/**
527560
* details for an instance of GlassFish Server 8.0.0
528561
*/
529562
GLASSFISH_SERVER_8_0_0(NbBundle.getMessage(ServerDetails.class, "STR_800_SERVER_NAME", new Object[]{}), // NOI18N
530563
GlassfishInstanceProvider.JAKARTAEE11_DEPLOYER_FRAGMENT,
531564
GlassFishVersion.GF_8_0_0,
532-
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M9/glassfish-8.0.0-M9.zip", // NOI18N
533-
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M9/glassfish-8.0.0-M9.zip", // NOI18N
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
534567
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
535568
);
536569

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

+3
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,9 @@ STR_7018_SERVER_NAME=GlassFish Server 7.0.18
189189
STR_7019_SERVER_NAME=GlassFish Server 7.0.19
190190
STR_7020_SERVER_NAME=GlassFish Server 7.0.20
191191
STR_7021_SERVER_NAME=GlassFish Server 7.0.21
192+
STR_7022_SERVER_NAME=GlassFish Server 7.0.22
193+
STR_7023_SERVER_NAME=GlassFish Server 7.0.23
194+
STR_7024_SERVER_NAME=GlassFish Server 7.0.24
192195

193196
STR_V8_FAMILY_NAME=GlassFish Server
194197
STR_800_SERVER_NAME=GlassFish Server 8.0.0

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

+24
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,12 @@ public enum GlassFishVersion {
141141
GF_7_0_20 ((short) 7, (short) 0, (short) 20, (short) 0, GlassFishVersion.GF_7_0_20_STR),
142142
/** GlassFish 7.0.21 */
143143
GF_7_0_21 ((short) 7, (short) 0, (short) 21, (short) 0, GlassFishVersion.GF_7_0_21_STR),
144+
/** GlassFish 7.0.22 */
145+
GF_7_0_22 ((short) 7, (short) 0, (short) 22, (short) 0, GlassFishVersion.GF_7_0_22_STR),
146+
/** GlassFish 7.0.23 */
147+
GF_7_0_23 ((short) 7, (short) 0, (short) 23, (short) 0, GlassFishVersion.GF_7_0_23_STR),
148+
/** GlassFish 7.0.24 */
149+
GF_7_0_24 ((short) 7, (short) 0, (short) 24, (short) 0, GlassFishVersion.GF_7_0_24_STR),
144150
/** GlassFish 8.0.0 */
145151
GF_8_0_0 ((short) 8, (short) 0, (short) 0, (short) 0, GlassFishVersion.GF_8_0_0_STR);
146152
////////////////////////////////////////////////////////////////////////////
@@ -403,6 +409,21 @@ public enum GlassFishVersion {
403409
/** Additional {@code String} representations of GF_7_0_21 value. */
404410
static final String GF_7_0_21_STR_NEXT[] = {"7.0.21", "7.0.21.0"};
405411

412+
/** A {@code String} representation of GF_7_0_22 value. */
413+
static final String GF_7_0_22_STR = "7.0.22";
414+
/** Additional {@code String} representations of GF_7_0_22 value. */
415+
static final String GF_7_0_22_STR_NEXT[] = {"7.0.22", "7.0.22.0"};
416+
417+
/** A {@code String} representation of GF_7_0_23 value. */
418+
static final String GF_7_0_23_STR = "7.0.23";
419+
/** Additional {@code String} representations of GF_7_0_23 value. */
420+
static final String GF_7_0_23_STR_NEXT[] = {"7.0.23", "7.0.23.0"};
421+
422+
/** A {@code String} representation of GF_7_0_24 value. */
423+
static final String GF_7_0_24_STR = "7.0.24";
424+
/** Additional {@code String} representations of GF_7_0_24 value. */
425+
static final String GF_7_0_24_STR_NEXT[] = {"7.0.24", "7.0.24.0"};
426+
406427
/** A {@code String} representation of GF_8_0_0 value. */
407428
static final String GF_8_0_0_STR = "8.0.0";
408429
/** Additional {@code String} representations of GF_8_0_0 value. */
@@ -466,6 +487,9 @@ public enum GlassFishVersion {
466487
initStringValuesMapFromArray(GF_7_0_19, GF_7_0_19_STR_NEXT);
467488
initStringValuesMapFromArray(GF_7_0_20, GF_7_0_20_STR_NEXT);
468489
initStringValuesMapFromArray(GF_7_0_21, GF_7_0_21_STR_NEXT);
490+
initStringValuesMapFromArray(GF_7_0_22, GF_7_0_22_STR_NEXT);
491+
initStringValuesMapFromArray(GF_7_0_23, GF_7_0_23_STR_NEXT);
492+
initStringValuesMapFromArray(GF_7_0_24, GF_7_0_24_STR_NEXT);
469493
initStringValuesMapFromArray(GF_8_0_0, GF_8_0_0_STR_NEXT);
470494
}
471495

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

+17-1
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,21 @@ public class ConfigBuilderProvider {
224224
= new Config.Next(GlassFishVersion.GF_7_0_21,
225225
ConfigBuilderProvider.class.getResource("GlassFishV7_0_17.xml"));
226226

227+
/** Library builder configuration since GlassFish 7.0.22. */
228+
private static final Config.Next CONFIG_V7_0_22
229+
= new Config.Next(GlassFishVersion.GF_7_0_22,
230+
ConfigBuilderProvider.class.getResource("GlassFishV7_0_17.xml"));
231+
232+
/** Library builder configuration since GlassFish 7.0.23. */
233+
private static final Config.Next CONFIG_V7_0_23
234+
= new Config.Next(GlassFishVersion.GF_7_0_23,
235+
ConfigBuilderProvider.class.getResource("GlassFishV7_0_17.xml"));
236+
237+
/** Library builder configuration since GlassFish 7.0.24. */
238+
private static final Config.Next CONFIG_V7_0_24
239+
= new Config.Next(GlassFishVersion.GF_7_0_24,
240+
ConfigBuilderProvider.class.getResource("GlassFishV7_0_24.xml"));
241+
227242
/** Library builder configuration since GlassFish 8.0.0. */
228243
private static final Config.Next CONFIG_V8_0_0
229244
= new Config.Next(GlassFishVersion.GF_8_0_0,
@@ -242,7 +257,8 @@ public class ConfigBuilderProvider {
242257
CONFIG_V7_0_12, CONFIG_V7_0_13, CONFIG_V7_0_14,
243258
CONFIG_V7_0_15, CONFIG_V7_0_16, CONFIG_V7_0_17,
244259
CONFIG_V7_0_18, CONFIG_V7_0_19, CONFIG_V7_0_20,
245-
CONFIG_V7_0_21, CONFIG_V8_0_0);
260+
CONFIG_V7_0_21, CONFIG_V7_0_22, CONFIG_V7_0_23,
261+
CONFIG_V7_0_24, CONFIG_V8_0_0);
246262

247263
/** Builders array for each server instance. */
248264
private static final ConcurrentMap<GlassFishServer, ConfigBuilder> builders

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

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
21+
-->
22+
<server>
23+
<tools lib="lib">
24+
<asadmin jar="client/appserver-cli.jar"/>
25+
</tools>
26+
<java version="21">
27+
<platform version="11"/>
28+
<platform version="12"/>
29+
<platform version="13"/>
30+
<platform version="14"/>
31+
<platform version="15"/>
32+
<platform version="16"/>
33+
<platform version="17"/>
34+
<platform version="18"/>
35+
<platform version="19"/>
36+
<platform version="20"/>
37+
<platform version="21"/>
38+
<platform version="22"/>
39+
<platform version="23"/>
40+
<platform version="24"/>
41+
</java>
42+
<javaee version="10.0.0">
43+
<profile version="10.0.0" type="web"/>
44+
<profile version="10.0.0" type="full" check="full"/>
45+
<module type="war"/>
46+
<module type="car" check="full"/>
47+
<module type="ear" check="full"/>
48+
<module type="ejb" check="full"/>
49+
<module type="rar" check="full"/>
50+
<check name="full">
51+
<file path="appclient-server-core.jar"/>
52+
</check>
53+
</javaee>
54+
<library id="Java EE">
55+
<classpath>
56+
<fileset dir="modules">
57+
<include name="jakarta\..+\.jar"/>
58+
<include name="jakarta.enterprise.cdi-api.jar"/>
59+
<include name="jakarta.validation-api.jar"/>
60+
<include name="jaxb-osgi.jar"/>
61+
<include name="webservices-osgi.jar"/>
62+
<include name="weld-osgi-bundle.jar"/>
63+
</fileset>
64+
<fileset dir="modules/endorsed">
65+
<include name=".+\.jar"/>
66+
</fileset>
67+
</classpath>
68+
<javadocs>
69+
<lookup path="docs/jakartaee10-doc-api.jar"/>
70+
</javadocs>
71+
<sources>
72+
</sources>
73+
</library>
74+
<library id="Jersey 3">
75+
<classpath>
76+
<fileset dir="modules">
77+
<include name="jackson.+\.jar"/>
78+
<include name="jersey.+\.jar"/>
79+
<include name="jettison.*\.jar"/>
80+
</fileset>
81+
</classpath>
82+
<javadocs>
83+
<link url="https://repo.maven.apache.org/maven2/org/glassfish/jersey/jersey-documentation/3.1.10/jersey-documentation-3.1.10-docbook.zip"/>
84+
</javadocs>
85+
<sources>
86+
</sources>
87+
</library>
88+
<library id="JAX-RS">
89+
<classpath>
90+
<fileset dir="modules">
91+
<include name="jakarta.ws.rs-api.jar"/>
92+
</fileset>
93+
</classpath>
94+
<javadocs>
95+
</javadocs>
96+
<sources>
97+
</sources>
98+
</library>
99+
</server>

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

+1-1
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/3.1.3/jersey-documentation-3.1.3-docbook.zip"/>
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"/>
7474
</javadocs>
7575
<sources>
7676
</sources>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -168,15 +168,15 @@ public void testGetInstanceforVersionGF6() {
168168
}
169169

170170
/**
171-
* Test factory functionality for GlassFish v. 7.0.21
171+
* Test factory functionality for GlassFish v. 7.0.24
172172
* <p/>
173173
* Factory should initialize REST {@code Runner} and point it to
174174
* provided {@code Command} instance.
175175
*/
176176
@Test
177177
public void testGetInstanceforVersionGF7() {
178178
GlassFishServerEntity srv = new GlassFishServerEntity();
179-
srv.setVersion(GlassFishVersion.GF_7_0_21);
179+
srv.setVersion(GlassFishVersion.GF_7_0_24);
180180
AdminFactory af = AdminFactory.getInstance(srv.getVersion());
181181
assertTrue(af instanceof AdminFactoryRest);
182182
Command cmd = new CommandVersion();

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

+9-2
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,12 @@ public void testToValue() {
141141
GlassFishVersion.GF_7_0_20_STR_NEXT);
142142
verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_21,
143143
GlassFishVersion.GF_7_0_21_STR_NEXT);
144+
verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_22,
145+
GlassFishVersion.GF_7_0_22_STR_NEXT);
146+
verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_23,
147+
GlassFishVersion.GF_7_0_23_STR_NEXT);
148+
verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_24,
149+
GlassFishVersion.GF_7_0_24_STR_NEXT);
144150
verifyToValueFromAdditionalArray(GlassFishVersion.GF_8_0_0,
145151
GlassFishVersion.GF_8_0_0_STR_NEXT);
146152
}
@@ -175,7 +181,8 @@ public void testToValueIncomplete() {
175181
GlassFishVersion.GF_7_0_16, GlassFishVersion.GF_7_0_17,
176182
GlassFishVersion.GF_7_0_18, GlassFishVersion.GF_7_0_19,
177183
GlassFishVersion.GF_7_0_20, GlassFishVersion.GF_7_0_21,
178-
GlassFishVersion.GF_8_0_0
184+
GlassFishVersion.GF_7_0_22, GlassFishVersion.GF_7_0_23,
185+
GlassFishVersion.GF_7_0_24, GlassFishVersion.GF_8_0_0
179186
};
180187
String strings[] = {
181188
"1.0.1.4", "2.0.1.5", "2.1.0.3", "2.1.1.7",
@@ -190,7 +197,7 @@ public void testToValueIncomplete() {
190197
"7.0.10.0", "7.0.11.0", "7.0.12.0", "7.0.13.0",
191198
"7.0.14.0", "7.0.15.0", "7.0.16.0", "7.0.17.0",
192199
"7.0.18.0", "7.0.19.0", "7.0.20.0", "7.0.21.0",
193-
"8.0.0.0"
200+
"7.0.22.0", "7.0.23.0", "7.0.24.0", "8.0.0.0"
194201
};
195202
for (int i = 0; i < versions.length; i++) {
196203
GlassFishVersion version = GlassFishVersion.toValue(strings[i]);

0 commit comments

Comments
 (0)