Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Glassfish 7.0.1 #5466

Merged
merged 4 commits into from
Feb 13, 2023
Merged

Add support for Glassfish 7.0.1 #5466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3647532
- Add missing validations for servlet 5 and 6
pepness Feb 10, 2023
e660466
Add support for GlassFish 7.0.1
pepness Feb 10, 2023
c0459d8
GlassFishV6_2_5 uses same deployer as GlassFishV6_2_4
pepness Feb 10, 2023
2a90c4e
Remove ancient comment, there is already logic to support lookup keys
pepness Feb 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ STR_623_SERVER_NAME=GlassFish Server 6.2.3
STR_624_SERVER_NAME=GlassFish Server 6.2.4
STR_625_SERVER_NAME=GlassFish Server 6.2.5
STR_700_SERVER_NAME=GlassFish Server 7.0.0
STR_701_SERVER_NAME=GlassFish Server 7.0.1

# CommonServerSupport.java
MSG_FLAKEY_NETWORK=<html>Network communication problem<br/>Could not establish \
Expand Down
18 changes: 16 additions & 2 deletions enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,19 @@ public enum ServerDetails {
GLASSFISH_SERVER_7_0_0(NbBundle.getMessage(ServerDetails.class, "STR_700_SERVER_NAME", new Object[]{}), // NOI18N
"deployer:gfv700ee10", // NOI18N
700,
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.0-M4/glassfish-7.0.0-M4.zip", // NOI18N
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.0-M4/glassfish-7.0.0-M4.zip", // NOI18N
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.0/glassfish-7.0.0.zip", // NOI18N
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.0/glassfish-7.0.0.zip", // NOI18N
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
),

/**
* details for an instance of GlassFish Server 7.0.1
*/
GLASSFISH_SERVER_7_0_1(NbBundle.getMessage(ServerDetails.class, "STR_701_SERVER_NAME", new Object[]{}), // NOI18N
"deployer:gfv700ee10", // NOI18N
700,
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.1/glassfish-7.0.1.zip", // NOI18N
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.1/glassfish-7.0.1.zip", // NOI18N
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
);

Expand All @@ -312,6 +323,7 @@ public enum ServerDetails {
public static WizardDescriptor.InstantiatingIterator
getInstantiatingIterator() {
return new ServerWizardIterator(new ServerDetails[]{
GLASSFISH_SERVER_7_0_1,
GLASSFISH_SERVER_7_0_0,
GLASSFISH_SERVER_6_2_5,
GLASSFISH_SERVER_6_2_4,
Expand All @@ -336,6 +348,7 @@ public enum ServerDetails {
GLASSFISH_SERVER_3_0_1,
GLASSFISH_SERVER_3},
new ServerDetails[]{
GLASSFISH_SERVER_7_0_1,
GLASSFISH_SERVER_7_0_0,
GLASSFISH_SERVER_6_2_5,
GLASSFISH_SERVER_6_2_4,
Expand Down Expand Up @@ -396,6 +409,7 @@ public static int getVersionFromInstallDirectory(File glassfishDir) {
case GF_6_2_4: return GLASSFISH_SERVER_6_2_4.getVersion();
case GF_6_2_5: return GLASSFISH_SERVER_6_2_5.getVersion();
case GF_7_0_0: return GLASSFISH_SERVER_7_0_0.getVersion();
case GF_7_0_1: return GLASSFISH_SERVER_7_0_1.getVersion();
default: return -1;
}
}
Expand Down
26 changes: 26 additions & 0 deletions ...ish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2eeModuleHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,10 @@ protected ASDDVersion getMinASVersion(String j2eeModuleVersion, ASDDVersion defa
result = ASDDVersion.SUN_APPSERVER_10_0;
} else if (ServletVersion.SERVLET_4_0.equals(servletVersion)) {
result = ASDDVersion.GLASSFISH_5_1;
} else if (ServletVersion.SERVLET_5_0.equals(servletVersion)) {
result = ASDDVersion.GLASSFISH_6;
} else if (ServletVersion.SERVLET_6_0.equals(servletVersion)) {
result = ASDDVersion.GLASSFISH_7;
}
return result;
}
Expand Down Expand Up @@ -265,6 +269,12 @@ protected ASDDVersion getMinASVersion(String j2eeModuleVersion, ASDDVersion defa
result = ASDDVersion.SUN_APPSERVER_9_0;
} else if (EjbJarVersion.EJBJAR_3_1.equals(ejbJarVersion)) {
result = ASDDVersion.SUN_APPSERVER_10_0;
} else if (EjbJarVersion.EJBJAR_3_2.equals(ejbJarVersion)) {
result = ASDDVersion.GLASSFISH_4_1;
} else if (EjbJarVersion.EJBJAR_3_2_6.equals(ejbJarVersion)) {
result = ASDDVersion.GLASSFISH_5_1;
} else if (EjbJarVersion.EJBJAR_4_0.equals(ejbJarVersion)) {
result = ASDDVersion.GLASSFISH_7;
}
return result;
}
Expand Down Expand Up @@ -296,6 +306,14 @@ protected ASDDVersion getMinASVersion(String j2eeModuleVersion, ASDDVersion defa
result = ASDDVersion.SUN_APPSERVER_9_0;
} else if (ApplicationVersion.APPLICATION_6_0.equals(applicationVersion)) {
result = ASDDVersion.SUN_APPSERVER_10_0;
} else if (ApplicationVersion.APPLICATION_7_0.equals(applicationVersion)) {
result = ASDDVersion.GLASSFISH_4_1;
} else if (ApplicationVersion.APPLICATION_8_0.equals(applicationVersion)) {
result = ASDDVersion.GLASSFISH_5_1;
} else if (ApplicationVersion.APPLICATION_9_0.equals(applicationVersion)) {
result = ASDDVersion.GLASSFISH_6;
} else if (ApplicationVersion.APPLICATION_10_0.equals(applicationVersion)) {
result = ASDDVersion.GLASSFISH_7;
}
return result;
}
Expand Down Expand Up @@ -327,6 +345,14 @@ protected ASDDVersion getMinASVersion(String j2eeModuleVersion, ASDDVersion defa
result = ASDDVersion.SUN_APPSERVER_9_0;
} else if (AppClientVersion.APP_CLIENT_6_0.equals(appClientVersion)) {
result = ASDDVersion.SUN_APPSERVER_10_0;
} else if (AppClientVersion.APP_CLIENT_7_0.equals(appClientVersion)) {
result = ASDDVersion.GLASSFISH_4_1;
} else if (AppClientVersion.APP_CLIENT_8_0.equals(appClientVersion)) {
result = ASDDVersion.GLASSFISH_5_1;
} else if (AppClientVersion.APP_CLIENT_9_0.equals(appClientVersion)) {
result = ASDDVersion.GLASSFISH_6;
} else if (AppClientVersion.APP_CLIENT_10_0.equals(appClientVersion)) {
result = ASDDVersion.GLASSFISH_7;
}
return result;
}
Expand Down
9 changes: 9 additions & 0 deletions ...sfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ServletVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,13 @@ public final class ServletVersion extends J2EEBaseVersion {
"5.0", 5000, // NOI18N
"9.0", 9000 // NOI18N
);

/** Represents servlet version 6.0
*/
public static final ServletVersion SERVLET_6_0 = new ServletVersion(
"6.0", 6000, // NOI18N
"10.0", 10000 // NOI18N
);

/** -----------------------------------------------------------------------
* Implementation
Expand Down Expand Up @@ -114,6 +121,8 @@ public static ServletVersion getServletVersion(String version) {
result = SERVLET_4_0;
} else if(SERVLET_5_0.toString().equals(version)) {
result = SERVLET_5_0;
} else if(SERVLET_6_0.toString().equals(version)) {
result = SERVLET_6_0;
}

return result;
Expand Down
2 changes: 1 addition & 1 deletion ...rise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public static synchronized DeploymentFactory createJakartaEe10() {
// FIXME -- these strings should come from some constant place
if (jakartaee10Instance == null) {
ServerUtilities tmp = ServerUtilities.getJakartaEe10Utilities();
jakartaee10Instance = new Hk2DeploymentFactory(new String[]{"deployer:gfv700ee10:", "deployer:gfv7"}, "0.7", // NOI18N
jakartaee10Instance = new Hk2DeploymentFactory(new String[]{"deployer:gfv700ee10:", "deployer:gfv7"}, "0.8", // NOI18N
NbBundle.getMessage(Hk2DeploymentFactory.class, "TXT_FactoryDisplayName")); // NOI18N
DeploymentFactoryManager.getInstance().registerDeploymentFactory(jakartaee10Instance);
jakartaee10Instance.setServerUtilities(tmp);
Expand Down
17 changes: 6 additions & 11 deletions .../glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,20 @@ public class Hk2JavaEEPlatformFactory extends J2eePlatformFactory {
////////////////////////////////////////////////////////////////////////////

/** GlassFish V3 JavaEE platform lookup key. */
private static final String V3_LOOKUP_KEY
= "J2EE/DeploymentPlugins/gfv3ee6/Lookup";
private static final String V3_LOOKUP_KEY = "J2EE/DeploymentPlugins/gfv3ee6/Lookup";

/** GlassFish V4 JavaEE platform lookup key.
* <p/>We will keep V3 value now because no one knows what will get broken
* when changing it. */
/** GlassFish V4 JavaEE platform lookup key. */
private static final String V4_LOOKUP_KEY = "J2EE/DeploymentPlugins/gfv4ee7/Lookup";

/** GlassFish V5 JavaEE platform lookup key.
* <p/>We will keep V3 value now because no one knows what will get broken
* when changing it. */
/** GlassFish V5 JavaEE platform lookup key. */
private static final String V5_LOOKUP_KEY = "J2EE/DeploymentPlugins/gfv5ee8/Lookup";
private static final String V510_LOOKUP_KEY = "J2EE/DeploymentPlugins/gfv510ee8/Lookup";

/** GlassFish V6 JakartaEE platform lookup key.
* <p/>We will keep V3 value now because no one knows what will get broken
* when changing it. */
/** GlassFish V6 JakartaEE platform lookup key. */
private static final String V6_LOOKUP_KEY = "J2EE/DeploymentPlugins/gfv6ee9/Lookup";
private static final String V610_LOOKUP_KEY = "J2EE/DeploymentPlugins/gfv610ee9/Lookup";

/** GlassFish V7 JakartaEE platform lookup key. */
private static final String V7_LOOKUP_KEY = "J2EE/DeploymentPlugins/gfv700ee10/Lookup";

/** GlassFish JavaEE platform factory singleton object. */
Expand Down
12 changes: 10 additions & 2 deletions ...e/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,10 @@ public enum GlassFishVersion {
GF_6_2_4 ((short) 6, (short) 2, (short) 4, (short) 0, GlassFishVersion.GF_6_2_4_STR),
/** GlassFish 6.2.5 */
GF_6_2_5 ((short) 6, (short) 2, (short) 5, (short) 0, GlassFishVersion.GF_6_2_5_STR),
/** GlassFish 6.2.5 */
GF_7_0_0 ((short) 7, (short) 0, (short) 0, (short) 0, GlassFishVersion.GF_7_0_0_STR);
/** GlassFish 7.0.0 */
GF_7_0_0 ((short) 7, (short) 0, (short) 0, (short) 0, GlassFishVersion.GF_7_0_0_STR),
/** GlassFish 7.0.1 */
GF_7_0_1 ((short) 7, (short) 0, (short) 1, (short) 0, GlassFishVersion.GF_7_0_1_STR);
////////////////////////////////////////////////////////////////////////////
// Class attributes //
////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -253,6 +255,11 @@ public enum GlassFishVersion {
static final String GF_7_0_0_STR = "7.0.0";
/** Additional <code>String</code> representations of GF_7_0_0 value. */
static final String GF_7_0_0_STR_NEXT[] = {"7.0.0", "7.0.0.0"};

/** A <code>String</code> representation of GF_7_0_1 value. */
static final String GF_7_0_1_STR = "7.0.1";
/** Additional <code>String</code> representations of GF_7_0_1 value. */
static final String GF_7_0_1_STR_NEXT[] = {"7.0.1", "7.0.1.0"};

/**
* Stored <code>String</code> values for backward <code>String</code>
Expand Down Expand Up @@ -291,6 +298,7 @@ public enum GlassFishVersion {
initStringValuesMapFromArray(GF_6_2_4, GF_6_2_4_STR_NEXT);
initStringValuesMapFromArray(GF_6_2_5, GF_6_2_5_STR_NEXT);
initStringValuesMapFromArray(GF_7_0_0, GF_7_0_0_STR_NEXT);
initStringValuesMapFromArray(GF_7_0_1, GF_7_0_1_STR_NEXT);
}

////////////////////////////////////////////////////////////////////////////
Expand Down
8 changes: 7 additions & 1 deletion ...oling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,19 @@ public class ConfigBuilderProvider {
private static final Config.Next CONFIG_V7_0_0
= new Config.Next(GlassFishVersion.GF_7_0_0,
ConfigBuilderProvider.class.getResource("GlassFishV7_0_0.xml"));

/** Library builder configuration since GlassFish 7.0.1. */
private static final Config.Next CONFIG_V7_0_1
= new Config.Next(GlassFishVersion.GF_7_0_1,
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,
CONFIG_V5_0_1, CONFIG_V5_1, CONFIG_V6, CONFIG_V6_1_0,
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_V6_2_3, CONFIG_V6_2_4, CONFIG_V6_2_5,
CONFIG_V7_0_0, CONFIG_V7_0_1);

/** Builders array for each server instance. */
private static final Map<GlassFishServer, ConfigBuilder> builders
Expand Down
7 changes: 5 additions & 2 deletions ...oling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ public void testToValue() {
GlassFishVersion.GF_6_2_5_STR_NEXT);
verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_0,
GlassFishVersion.GF_7_0_0_STR_NEXT);
verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_1,
GlassFishVersion.GF_7_0_1_STR_NEXT);
}

/**
Expand All @@ -119,7 +121,8 @@ public void testToValueIncomplete() {
GlassFishVersion.GF_6, GlassFishVersion.GF_6_1_0,
GlassFishVersion.GF_6_2_0, GlassFishVersion.GF_6_2_1,
GlassFishVersion.GF_6_2_2, GlassFishVersion.GF_6_2_3,
GlassFishVersion.GF_6_2_4, GlassFishVersion.GF_6_2_5
GlassFishVersion.GF_6_2_4, GlassFishVersion.GF_6_2_5,
GlassFishVersion.GF_7_0_0, GlassFishVersion.GF_7_0_1
};
String strings[] = {
"1.0.1.4", "2.0.1.5", "2.1.0.3", "2.1.1.7",
Expand All @@ -128,7 +131,7 @@ public void testToValueIncomplete() {
"4.1.0.0", "4.1.1.0", "4.1.2.0", "5.0.0.0",
"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"
"6.2.4.0", "6.2.5.0", "7.0.0.0", "7.0.1.0"
};
for (int i = 0; i < versions.length; i++) {
GlassFishVersion version = GlassFishVersion.toValue(strings[i]);
Expand Down
56 changes: 55 additions & 1 deletion enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/ASDDVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,61 @@ public final class ASDDVersion {
"GlassFish Server 3.1" // NOI18N
);

/** Represents GF Server 5.0
/** Represents GF Server 4.0
*/
public static final ASDDVersion GLASSFISH_4_0 = new ASDDVersion(
"4.1", 100, // NOI18N
DTDRegistry.GLASSFISH_WEBAPP_301_DTD_PUBLIC_ID,
DTDRegistry.GLASSFISH_WEBAPP_301_DTD_SYSTEM_ID,
SunWebApp.VERSION_3_0_1,
301,
DTDRegistry.GLASSFISH_EJBJAR_311_DTD_PUBLIC_ID,
DTDRegistry.GLASSFISH_EJBJAR_311_DTD_SYSTEM_ID,
SunEjbJar.VERSION_3_1_1,
311,
DTDRegistry.SUN_CMP_MAPPING_810_DTD_PUBLIC_ID,
DTDRegistry.SUN_CMP_MAPPING_810_DTD_SYSTEM_ID,
"1.2",
120,
DTDRegistry.GLASSFISH_APPLICATION_601_DTD_PUBLIC_ID,
DTDRegistry.GLASSFISH_APPLICATION_601_DTD_SYSTEM_ID,
SunApplication.VERSION_6_0_1,
601,
DTDRegistry.GLASSFISH_APPCLIENT_601_DTD_PUBLIC_ID,
DTDRegistry.GLASSFISH_APPCLIENT_601_DTD_SYSTEM_ID,
SunApplicationClient.VERSION_6_0_1,
601,
"GlassFish Server 4.0" // NOI18N
);

/** Represents GF Server 4.1
*/
public static final ASDDVersion GLASSFISH_4_1 = new ASDDVersion(
"4.1", 100, // NOI18N
DTDRegistry.GLASSFISH_WEBAPP_301_DTD_PUBLIC_ID,
DTDRegistry.GLASSFISH_WEBAPP_301_DTD_SYSTEM_ID,
SunWebApp.VERSION_3_0_1,
301,
DTDRegistry.GLASSFISH_EJBJAR_311_DTD_PUBLIC_ID,
DTDRegistry.GLASSFISH_EJBJAR_311_DTD_SYSTEM_ID,
SunEjbJar.VERSION_3_1_1,
311,
DTDRegistry.SUN_CMP_MAPPING_810_DTD_PUBLIC_ID,
DTDRegistry.SUN_CMP_MAPPING_810_DTD_SYSTEM_ID,
"1.2",
120,
DTDRegistry.GLASSFISH_APPLICATION_601_DTD_PUBLIC_ID,
DTDRegistry.GLASSFISH_APPLICATION_601_DTD_SYSTEM_ID,
SunApplication.VERSION_6_0_1,
601,
DTDRegistry.GLASSFISH_APPCLIENT_601_DTD_PUBLIC_ID,
DTDRegistry.GLASSFISH_APPCLIENT_601_DTD_SYSTEM_ID,
SunApplicationClient.VERSION_6_0_1,
601,
"GlassFish Server 4.1" // NOI18N
);

/** Represents GF Server 5.0
*/
public static final ASDDVersion GLASSFISH_5_0 = new ASDDVersion(
"5.0", 100, // NOI18N
Expand Down