Skip to content

Commit ad297ed

Browse files
matthiasblaesingmatthiasblaesing
authored
Merge pull request #4692 from jGauravGupta/JAKARTA_EE_10.0.0
Jakarta EE 10 - Platform/API/RI support
2 parents a97c358 + be2b078 commit ad297ed

File tree

195 files changed

+17322
-432
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+17322
-432
lines changed

‎enterprise/glassfish.common/nbproject/org-netbeans-modules-glassfish-common.sig‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,8 +1393,9 @@ fld public final static java.lang.String EE7_DEPLOYER_FRAGMENT = "deployer:gfv4e
13931393
fld public final static java.lang.String EE8_DEPLOYER_FRAGMENT = "deployer:gfv5ee8"
13941394
fld public final static java.lang.String GLASSFISH_AUTOREGISTERED_INSTANCE = "glassfish_autoregistered_instance"
13951395
fld public final static java.lang.String JAKARTAEE8_DEPLOYER_FRAGMENT = "deployer:gfv510ee8"
1396-
fld public final static java.lang.String JAKARTAEE91_DEPLOYER_FRAGMENT = "deployer:gfv610ee9"
13971396
fld public final static java.lang.String JAKARTAEE9_DEPLOYER_FRAGMENT = "deployer:gfv6ee9"
1397+
fld public final static java.lang.String JAKARTAEE91_DEPLOYER_FRAGMENT = "deployer:gfv610ee9"
1398+
fld public final static java.lang.String JAKARTAEE10_DEPLOYER_FRAGMENT = "deployer:gfv700ee10"
13981399
fld public final static java.lang.String PRELUDE_DEPLOYER_FRAGMENT = "deployer:gfv3"
13991400
fld public final static java.util.Set<java.lang.String> activeRegistrationSet
14001401
fld public static java.lang.String EE6WC_DEFAULT_NAME
@@ -1420,7 +1421,7 @@ meth public void addServerInstance(org.netbeans.modules.glassfish.common.Glassfi
14201421
meth public void removeChangeListener(javax.swing.event.ChangeListener)
14211422
meth public void resultChanged(org.openide.util.LookupEvent)
14221423
supr java.lang.Object
1423-
hfds AUTOINSTANCECOPIED,EE6WC_INSTANCES_PATH,EE6_INSTANCES_PATH,EE7_INSTANCES_PATH,EE8_INSTANCES_PATH,JAKARTAEE8_INSTANCES_PATH,JAKARTAEE91_INSTANCES_PATH,JAKARTAEE9_INSTANCES_PATH,LOGGER,activeDisplayNames,cf,displayName,glassFishProvider,instanceMap,instancesDirNames,lookupResult,needsJdk6,noPasswordOptions,support,uriFragments
1424+
hfds AUTOINSTANCECOPIED,EE6WC_INSTANCES_PATH,EE6_INSTANCES_PATH,EE7_INSTANCES_PATH,EE8_INSTANCES_PATH,JAKARTAEE8_INSTANCES_PATH,JAKARTAEE91_INSTANCES_PATH,JAKARTAEE9_INSTANCES_PATH,JAKARTAEE10_INSTANCES_PATH,LOGGER,activeDisplayNames,cf,displayName,glassFishProvider,instanceMap,instancesDirNames,lookupResult,needsJdk6,noPasswordOptions,support,uriFragments
14241425

14251426
CLSS public org.netbeans.modules.glassfish.common.Installer
14261427
cons public init()
@@ -1507,6 +1508,7 @@ fld public final static org.netbeans.modules.glassfish.common.ServerDetails GLAS
15071508
fld public final static org.netbeans.modules.glassfish.common.ServerDetails GLASSFISH_SERVER_6_2_3
15081509
fld public final static org.netbeans.modules.glassfish.common.ServerDetails GLASSFISH_SERVER_6_2_4
15091510
fld public final static org.netbeans.modules.glassfish.common.ServerDetails GLASSFISH_SERVER_6_2_5
1511+
fld public final static org.netbeans.modules.glassfish.common.ServerDetails GLASSFISH_SERVER_7_0_0
15101512
meth public boolean isInstalledInDirectory(java.io.File)
15111513
meth public int getVersion()
15121514
meth public java.lang.String getDirectUrl()
@@ -2234,6 +2236,7 @@ meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getEe8Util
22342236
meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getJakartaEe8Utilities()
22352237
meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getJakartaEe91Utilities()
22362238
meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getJakartaEe9Utilities()
2239+
meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getJakartaEe10Utilities()
22372240
meth public static org.openide.WizardDescriptor$InstantiatingIterator getInstantiatingIterator()
22382241
supr java.lang.Object
22392242
hfds gip,gwp

‎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
@@ -166,6 +166,7 @@ STR_622_SERVER_NAME=GlassFish Server 6.2.2
166166
STR_623_SERVER_NAME=GlassFish Server 6.2.3
167167
STR_624_SERVER_NAME=GlassFish Server 6.2.4
168168
STR_625_SERVER_NAME=GlassFish Server 6.2.5
169+
STR_700_SERVER_NAME=GlassFish Server 7.0.0
169170

170171
# CommonServerSupport.java
171172
MSG_FLAKEY_NETWORK=<html>Network communication problem<br/>Could not establish \

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public final class GlassfishInstanceProvider implements ServerInstanceProvider,
6868
public static final String JAKARTAEE8_DEPLOYER_FRAGMENT = "deployer:gfv510ee8";
6969
public static final String JAKARTAEE9_DEPLOYER_FRAGMENT = "deployer:gfv6ee9";
7070
public static final String JAKARTAEE91_DEPLOYER_FRAGMENT = "deployer:gfv610ee9";
71+
public static final String JAKARTAEE10_DEPLOYER_FRAGMENT = "deployer:gfv700ee10";
7172
public static final String EE6WC_DEPLOYER_FRAGMENT = "deployer:gfv3ee6wc"; // NOI18N
7273
public static final String PRELUDE_DEPLOYER_FRAGMENT = "deployer:gfv3"; // NOI18N
7374
private static String EE6_INSTANCES_PATH = "/GlassFishEE6/Instances"; // NOI18N
@@ -76,6 +77,7 @@ public final class GlassfishInstanceProvider implements ServerInstanceProvider,
7677
private static String JAKARTAEE8_INSTANCES_PATH = "/GlassFishJakartaEE8/Instances"; // NOI18N
7778
private static String JAKARTAEE9_INSTANCES_PATH = "/GlassFishJakartaEE9/Instances"; // NOI18N
7879
private static String JAKARTAEE91_INSTANCES_PATH = "/GlassFishJakartaEE91/Instances"; // NOI18N
80+
private static String JAKARTAEE10_INSTANCES_PATH = "/GlassFishJakartaEE10/Instances"; // NOI18N
7981
private static String EE6WC_INSTANCES_PATH = "/GlassFishEE6WC/Instances"; // NOI18N
8082

8183
public static String PRELUDE_DEFAULT_NAME = "GlassFish_v3_Prelude"; //NOI18N
@@ -100,11 +102,11 @@ public static GlassfishInstanceProvider getProvider() {
100102
new String[]{EE6_DEPLOYER_FRAGMENT, EE6WC_DEPLOYER_FRAGMENT,
101103
EE7_DEPLOYER_FRAGMENT, EE8_DEPLOYER_FRAGMENT,
102104
JAKARTAEE8_DEPLOYER_FRAGMENT, JAKARTAEE9_DEPLOYER_FRAGMENT,
103-
JAKARTAEE91_DEPLOYER_FRAGMENT},
105+
JAKARTAEE91_DEPLOYER_FRAGMENT, JAKARTAEE10_DEPLOYER_FRAGMENT},
104106
new String[]{EE6_INSTANCES_PATH, EE6WC_INSTANCES_PATH,
105107
EE7_INSTANCES_PATH, EE8_INSTANCES_PATH,
106108
JAKARTAEE8_INSTANCES_PATH, JAKARTAEE9_INSTANCES_PATH,
107-
JAKARTAEE91_INSTANCES_PATH},
109+
JAKARTAEE91_INSTANCES_PATH, JAKARTAEE10_INSTANCES_PATH},
108110
null,
109111
true,
110112
new String[]{"--nopassword"}, // NOI18N

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,17 @@ public enum ServerDetails {
290290
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.5/glassfish-6.2.5.zip", // NOI18N
291291
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.5/glassfish-6.2.5.zip", // NOI18N
292292
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
293+
),
294+
295+
/**
296+
* details for an instance of GlassFish Server 7.0.0
297+
*/
298+
GLASSFISH_SERVER_7_0_0(NbBundle.getMessage(ServerDetails.class, "STR_700_SERVER_NAME", new Object[]{}), // NOI18N
299+
"deployer:gfv700ee10", // NOI18N
300+
700,
301+
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.0-M4/glassfish-7.0.0-M4.zip", // NOI18N
302+
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.0-M4/glassfish-7.0.0-M4.zip", // NOI18N
303+
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
293304
);
294305

295306
/**
@@ -301,6 +312,7 @@ public enum ServerDetails {
301312
public static WizardDescriptor.InstantiatingIterator
302313
getInstantiatingIterator() {
303314
return new ServerWizardIterator(new ServerDetails[]{
315+
GLASSFISH_SERVER_7_0_0,
304316
GLASSFISH_SERVER_6_2_5,
305317
GLASSFISH_SERVER_6_2_4,
306318
GLASSFISH_SERVER_6_2_3,
@@ -324,6 +336,7 @@ public enum ServerDetails {
324336
GLASSFISH_SERVER_3_0_1,
325337
GLASSFISH_SERVER_3},
326338
new ServerDetails[]{
339+
GLASSFISH_SERVER_7_0_0,
327340
GLASSFISH_SERVER_6_2_5,
328341
GLASSFISH_SERVER_6_2_4,
329342
GLASSFISH_SERVER_6_2_3,
@@ -382,6 +395,7 @@ public static int getVersionFromInstallDirectory(File glassfishDir) {
382395
case GF_6_2_3: return GLASSFISH_SERVER_6_2_3.getVersion();
383396
case GF_6_2_4: return GLASSFISH_SERVER_6_2_4.getVersion();
384397
case GF_6_2_5: return GLASSFISH_SERVER_6_2_5.getVersion();
398+
case GF_7_0_0: return GLASSFISH_SERVER_7_0_0.getVersion();
385399
default: return -1;
386400
}
387401
}

‎enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistration.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,10 @@ private static int autoregisterGlassFishInstance(String clusterDirValue, String
8484
String deployer = "deployer:gfv3ee6";
8585
String defaultDisplayNamePrefix = "GlassFish Server ";
8686
GlassFishVersion version = ServerUtils.getServerVersion(glassfishRoot);
87-
if (GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)) {
87+
if (GlassFishVersion.ge(version, GlassFishVersion.GF_7_0_0)) {
88+
deployer = "deployer:gfv700ee10";
89+
config = "GlassFishJakartaEE10/Instances";
90+
} else if (GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)) {
8891
deployer = "deployer:gfv610ee9";
8992
config = "GlassFishJakartaEE91/Instances";
9093
} else if (GlassFishVersion.ge(version, GlassFishVersion.GF_6)) {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,9 @@ STR_623_SERVER_NAME=GlassFish Server 6.2.3
166166
STR_624_SERVER_NAME=GlassFish Server 6.2.4
167167
STR_625_SERVER_NAME=GlassFish Server 6.2.5
168168

169+
STR_V7_FAMILY_NAME=GlassFish Server
170+
STR_7_SERVER_NAME=GlassFish Server 7.0.0
171+
169172
LBL_SELECT_BITS=Select
170173
LBL_ChooseOne=Choose server to download:
171174

‎enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/GlassfishWizardProvider.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,13 @@ public static GlassfishWizardProvider createJakartaEe91() {
7272
);
7373
}
7474

75+
public static GlassfishWizardProvider createJakartaEe10() {
76+
return new GlassfishWizardProvider(
77+
org.openide.util.NbBundle.getMessage(GlassfishWizardProvider.class,
78+
"STR_V7_FAMILY_NAME", new Object[]{}) // NOI18N
79+
);
80+
}
81+
7582
private final String displayName;
7683

7784
private GlassfishWizardProvider(

‎enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,12 @@ public static ServerUtilities getJakartaEe91Utilities() {
107107
GlassfishWizardProvider.createJakartaEe91());
108108
}
109109

110+
public static ServerUtilities getJakartaEe10Utilities() {
111+
GlassfishInstanceProvider gip = GlassfishInstanceProvider.getProvider();
112+
return null == gip ? null : new ServerUtilities(gip,
113+
GlassfishWizardProvider.createJakartaEe10());
114+
}
115+
110116
// public static ServerUtilities getEe6WCUtilities() {
111117
// GlassfishInstanceProvider gip = GlassfishInstanceProvider.getProvider();
112118
// return null == gip ? null : new ServerUtilities(gip,

‎enterprise/glassfish.eecommon/nbproject/org-netbeans-modules-glassfish-eecommon.sig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -876,6 +876,7 @@ fld public final static org.netbeans.modules.glassfish.eecommon.api.config.AppCl
876876
fld public final static org.netbeans.modules.glassfish.eecommon.api.config.AppClientVersion APP_CLIENT_7_0
877877
fld public final static org.netbeans.modules.glassfish.eecommon.api.config.AppClientVersion APP_CLIENT_8_0
878878
fld public final static org.netbeans.modules.glassfish.eecommon.api.config.AppClientVersion APP_CLIENT_9_0
879+
fld public final static org.netbeans.modules.glassfish.eecommon.api.config.AppClientVersion APP_CLIENT_10_0
879880
meth public int compareTo(java.lang.Object)
880881
meth public static org.netbeans.modules.glassfish.eecommon.api.config.AppClientVersion getAppClientVersion(java.lang.String)
881882
supr org.netbeans.modules.glassfish.eecommon.api.config.J2EEBaseVersion
@@ -888,6 +889,7 @@ fld public final static org.netbeans.modules.glassfish.eecommon.api.config.Appli
888889
fld public final static org.netbeans.modules.glassfish.eecommon.api.config.ApplicationVersion APPLICATION_7_0
889890
fld public final static org.netbeans.modules.glassfish.eecommon.api.config.ApplicationVersion APPLICATION_8_0
890891
fld public final static org.netbeans.modules.glassfish.eecommon.api.config.ApplicationVersion APPLICATION_9_0
892+
fld public final static org.netbeans.modules.glassfish.eecommon.api.config.ApplicationVersion APPLICATION_10_0
891893
meth public int compareTo(java.lang.Object)
892894
meth public static org.netbeans.modules.glassfish.eecommon.api.config.ApplicationVersion getApplicationVersion(java.lang.String)
893895
supr org.netbeans.modules.glassfish.eecommon.api.config.J2EEBaseVersion
@@ -1195,6 +1197,7 @@ fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEV
11951197
fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion JAKARTAEE_8_0
11961198
fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion JAKARTAEE_9_0
11971199
fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion JAKARTAEE_9_1
1200+
fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion JAKARTAEE_10_0
11981201
fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion JAVAEE_5_0
11991202
fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion JAVAEE_6_0
12001203
fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion JAVAEE_7_0

‎enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/AppClientVersion.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,13 @@ public final class AppClientVersion extends J2EEBaseVersion {
7474
"9.0", 9000, // NOI18N
7575
"9.0", 9000 // NOI18N
7676
);
77+
78+
/** Represents application-client version 10.0
79+
*/
80+
public static final AppClientVersion APP_CLIENT_10_0 = new AppClientVersion(
81+
"10.0", 10000, // NOI18N
82+
"10.0", 10000 // NOI18N
83+
);
7784
/** -----------------------------------------------------------------------
7885
* Implementation
7986
*/
@@ -113,6 +120,8 @@ public static AppClientVersion getAppClientVersion(String version) {
113120
result = APP_CLIENT_8_0;
114121
} else if(APP_CLIENT_9_0.toString().equals(version)) {
115122
result = APP_CLIENT_9_0;
123+
} else if(APP_CLIENT_10_0.toString().equals(version)) {
124+
result = APP_CLIENT_10_0;
116125
}
117126

118127
return result;

0 commit comments

Comments
 (0)