This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new ca39b72 Jakarta EE 9 GlassFish 6 Support (#2902) ca39b72 is described below commit ca39b72572c3efe9e0340664f8f107d392ad2605 Author: Josh Juneau <juneau...@gmail.com> AuthorDate: Mon Jul 26 08:45:44 2021 -0500 Jakarta EE 9 GlassFish 6 Support (#2902) * Jakarta EE 9 GlassFish 6 Support * Repair GlassfishWizardProvider createJakartaEe91 method and jakartaee9-doc-api.jar --- .../org-netbeans-modules-glassfish-common.sig | 4 +- .../modules/glassfish/common/Bundle.properties | 1 + .../common/GlassfishInstanceProvider.java | 2 + .../modules/glassfish/common/ServerDetails.java | 19 +++++- .../common/registration/AutomaticRegistration.java | 3 + .../glassfish/common/wizards/Bundle.properties | 5 +- .../common/wizards/GlassfishWizardProvider.java | 7 +++ .../modules/glassfish/spi/ServerUtilities.java | 6 ++ .../api/config/GlassfishConfiguration.java | 5 +- .../javaee/AbstractHk2ConfigurationFactory.java | 9 ++- .../modules/glassfish/javaee/Bundle.properties | 2 + .../glassfish/javaee/Hk2DeploymentFactory.java | 18 ++++++ .../glassfish/javaee/Hk2JavaEEPlatformFactory.java | 15 ++++- .../glassfish/javaee/Hk2OptionalFactory.java | 6 ++ .../netbeans/modules/glassfish/javaee/layer.xml | 71 ++++++++++++++++++++-- .../modules/glassfish/javaee/nbdepjakartaee91.xml | 54 ++++++++++++++++ .../org-netbeans-modules-glassfish-tooling.sig | 3 +- .../glassfish/tooling/data/GlassFishVersion.java | 11 +++- .../server/config/ConfigBuilderProvider.java | 18 ++++-- .../tooling/server/config/GlassFishV6.xml | 2 +- .../{GlassFishV6.xml => GlassFishV6_1_0.xml} | 6 +- .../tooling/server/config/JavaEEProfile.java | 2 +- .../modules/j2ee/deployment/impl/layer.xml | 1 + .../modules/maven/j2ee/JavaEEMavenTestBase.java | 1 + .../modules/web/jsf/JSFFrameworkProvider.java | 2 +- 25 files changed, 244 insertions(+), 29 deletions(-) diff --git a/enterprise/glassfish.common/nbproject/org-netbeans-modules-glassfish-common.sig b/enterprise/glassfish.common/nbproject/org-netbeans-modules-glassfish-common.sig index f46bf2c..1bdfa38 100644 --- a/enterprise/glassfish.common/nbproject/org-netbeans-modules-glassfish-common.sig +++ b/enterprise/glassfish.common/nbproject/org-netbeans-modules-glassfish-common.sig @@ -1390,9 +1390,10 @@ CLSS public final org.netbeans.modules.glassfish.common.GlassfishInstanceProvide fld public final static java.lang.String EE6WC_DEPLOYER_FRAGMENT = "deployer:gfv3ee6wc" fld public final static java.lang.String EE6_DEPLOYER_FRAGMENT = "deployer:gfv3ee6" fld public final static java.lang.String EE8_DEPLOYER_FRAGMENT = "deployer:gfv5ee8" -fld public final static java.lang.String GLASSFISH_AUTOREGISTERED_INSTANCE = "glassfish_autoregistered_instance" fld public final static java.lang.String JAKARTAEE8_DEPLOYER_FRAGMENT = "deployer:gfv510ee8" fld public final static java.lang.String JAKARTAEE9_DEPLOYER_FRAGMENT = "deployer:gfv6ee9" +fld public final static java.lang.String JAKARTAEE91_DEPLOYER_FRAGMENT = "deployer:gfv610ee9" +fld public final static java.lang.String GLASSFISH_AUTOREGISTERED_INSTANCE = "glassfish_autoregistered_instance" fld public final static java.lang.String PRELUDE_DEPLOYER_FRAGMENT = "deployer:gfv3" fld public final static java.util.Set<java.lang.String> activeRegistrationSet fld public static java.lang.String EE6WC_DEFAULT_NAME @@ -2224,6 +2225,7 @@ meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getEe7Util meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getEe8Utilities() meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getJakartaEe8Utilities() meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getJakartaEe9Utilities() +meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getJakartaEe91Utilities() meth public static org.openide.WizardDescriptor$InstantiatingIterator getInstantiatingIterator() supr java.lang.Object hfds gip,gwp 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 1f47980..95652be 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 @@ -159,6 +159,7 @@ STR_50_SERVER_NAME=GlassFish Server 5.0 STR_501_SERVER_NAME=GlassFish Server 5.0.1 STR_510_SERVER_NAME=GlassFish Server 5.1.0 STR_6_SERVER_NAME=GlassFish Server 6 +STR_610_SERVER_NAME=GlassFish Server 6.1 # 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/GlassfishInstanceProvider.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java index 00a345f..b79dbdb 100644 --- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java +++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java @@ -66,6 +66,7 @@ public final class GlassfishInstanceProvider implements ServerInstanceProvider, public static final String EE8_DEPLOYER_FRAGMENT = "deployer:gfv5ee8"; // NOI18N public static final String JAKARTAEE8_DEPLOYER_FRAGMENT = "deployer:gfv510ee8"; public static final String JAKARTAEE9_DEPLOYER_FRAGMENT = "deployer:gfv6ee9"; + public static final String JAKARTAEE91_DEPLOYER_FRAGMENT = "deployer:gfv610ee9"; public static final String EE6WC_DEPLOYER_FRAGMENT = "deployer:gfv3ee6wc"; // NOI18N public static final String PRELUDE_DEPLOYER_FRAGMENT = "deployer:gfv3"; // NOI18N static private String EE6_INSTANCES_PATH = "/GlassFishEE6/Instances"; // NOI18N @@ -73,6 +74,7 @@ public final class GlassfishInstanceProvider implements ServerInstanceProvider, static private String EE9_INSTANCES_PATH = "/GlassFishEE9/Instances"; // NOI18N static private String JAKARTAEE8_INSTANCES_PATH = "/GlassFishJakartaEE8/Instances"; // NOI18N static private String JAKARTAEE9_INSTANCES_PATH = "/GlassFishJakartaEE9/Instances"; // NOI18N + // static private String JAKARTAEE91_INSTANCES_PATH = "/GlassFishJakartaEE91/Instances"; // NOI18N static private String EE6WC_INSTANCES_PATH = "/GlassFishEE6WC/Instances"; // NOI18N static public String PRELUDE_DEFAULT_NAME = "GlassFish_v3_Prelude"; //NOI18N 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 026332f..a5ce6a8 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 @@ -41,6 +41,7 @@ import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_4_ import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_5; import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_5_0_1; import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_6; +import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_6_1_0; import org.netbeans.modules.glassfish.tooling.utils.ServerUtils; import org.openide.WizardDescriptor; import org.openide.util.NbBundle; @@ -209,8 +210,19 @@ public enum ServerDetails { GLASSFISH_SERVER_6(NbBundle.getMessage(ServerDetails.class, "STR_6_SERVER_NAME", new Object[]{}), // NOI18N "deployer:gfv6ee9", // NOI18N 6, - "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.0.0-RC4/glassfish-6.0.0-RC4.zip", // NOI18N - "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.0.0-RC4/glassfish-6.0.0-RC4.zip", // NOI18N + "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.0.0/glassfish-6.0.0.zip", // NOI18N + "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.0.0/glassfish-6.0.0.zip", // NOI18N + "http://www.eclipse.org/legal/epl-2.0" //NOI18N + ), + + /** + * details for an instance of GlassFish Server 6.1.0 + */ + GLASSFISH_SERVER_6_1_0(NbBundle.getMessage(ServerDetails.class, "STR_610_SERVER_NAME", new Object[]{}), // NOI18N + "deployer:gfv610ee9", // NOI18N + 6, + "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.1.0/glassfish-6.1.0.zip", // NOI18N + "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.1.0/glassfish-6.1.0.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N ); @@ -223,6 +235,7 @@ public enum ServerDetails { public static WizardDescriptor.InstantiatingIterator getInstantiatingIterator() { return new ServerWizardIterator(new ServerDetails[]{ + GLASSFISH_SERVER_6_1_0, GLASSFISH_SERVER_6, GLASSFISH_SERVER_5_1_0, GLASSFISH_SERVER_5_0_1, @@ -239,6 +252,7 @@ public enum ServerDetails { GLASSFISH_SERVER_3_0_1, GLASSFISH_SERVER_3}, new ServerDetails[]{ + GLASSFISH_SERVER_6_1_0, GLASSFISH_SERVER_6, GLASSFISH_SERVER_5_1_0, GLASSFISH_SERVER_5_0_1, @@ -283,6 +297,7 @@ public enum ServerDetails { case GF_5_0_1: return GLASSFISH_SERVER_5_0_1.getVersion(); case GF_5_1_0: return GLASSFISH_SERVER_5_1_0.getVersion(); case GF_6: return GLASSFISH_SERVER_6.getVersion(); + case GF_6_1_0: return GLASSFISH_SERVER_6_1_0.getVersion(); default: return -1; } } diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistration.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistration.java index e4aed59..add2ec6 100644 --- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistration.java +++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistration.java @@ -95,6 +95,9 @@ public class AutomaticRegistration { } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_6)) { deployer = "deployer:gfv6ee9"; config = "GlassFishJakartaEE9/Instances"; + } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)) { + deployer = "deployer:gfv610ee9"; + config = "GlassFishJakartaEE9/Instances"; } StringBuilder sb = new StringBuilder( defaultDisplayNamePrefix.length() + 12); diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties index c27de81..3c5f379 100644 --- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties +++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties @@ -116,7 +116,7 @@ TIME_HOURS={0,choice, 1#{0} hour|2#{0} hours} TIME_MINUTES={0,choice, 1#{0} minute|2#{0} minutes} TIME_SECONDS={0,choice, 1#{0} second|2#{0} seconds} TIME_MILISECONDS={0} ms -TIME_SEPARATOR=,\ +TIME_SEPARATOR=,\ LBL_InstallLocation=Installation &Location: V3_PRELUDE_NAME=GlassFish v3 Prelude V3_EE6_NAME=GlassFish Server 3 @@ -157,6 +157,7 @@ STR_501_SERVER_NAME=GlassFish Server 5.0.1 STR_510_SERVER_NAME=GlassFish Server 5.1.0 STR_6_SERVER_NAME=GlassFish Server 6.0.0 +STR_610_SERVER_NAME=GlassFish Server 6.1.0 STR_V6_FAMILY_NAME=GlassFish Server LBL_SELECT_BITS=Select @@ -173,7 +174,7 @@ AddServerLocationVisualPanel.agreeCheckBox.AccessibleContext.accessibleDescripti AddServerLocationVisualPanel.remoteDomainRadioButton=Remote Domain AddServerLocationVisualPanel.localDomainRadioButton=Local Domain AddDomainLocationVisualPanel.targetValueLabel.text=&Target: -AddDomainLocationVisualPanel.targetValueField.text=\ \ \ \ \ \ \ \ \ \ \ \ \ \ +AddDomainLocationVisualPanel.targetValueField.text=\ \ \ \ \ \ \ \ \ \ \ \ \ \ AddDomainLocationVisualPanel.userNameLabel.text=&User Name: AddDomainLocationVisualPanel.passwordLabel.text=Pass&word: AddDomainLocationVisualPanel.httpPortFieldLabel.text=HTTP Port: diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/GlassfishWizardProvider.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/GlassfishWizardProvider.java index fa3a355..05983bd 100644 --- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/GlassfishWizardProvider.java +++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/GlassfishWizardProvider.java @@ -65,6 +65,13 @@ public class GlassfishWizardProvider implements ServerWizardProvider { ); } + public static GlassfishWizardProvider createJakartaEe91() { + return new GlassfishWizardProvider( + org.openide.util.NbBundle.getMessage(GlassfishWizardProvider.class, + "STR_V6_FAMILY_NAME", new Object[]{}) // NOI18N + ); + } + private final String displayName; private GlassfishWizardProvider( diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java index d3513ac..431d249 100644 --- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java +++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java @@ -101,6 +101,12 @@ public final class ServerUtilities { GlassfishWizardProvider.createJakartaEe9()); } + public static ServerUtilities getJakartaEe91Utilities() { + GlassfishInstanceProvider gip = GlassfishInstanceProvider.getProvider(); + return null == gip ? null : new ServerUtilities(gip, + GlassfishWizardProvider.createJakartaEe91()); + } + // public static ServerUtilities getEe6WCUtilities() { // GlassfishInstanceProvider gip = GlassfishInstanceProvider.getProvider(); // return null == gip ? null : new ServerUtilities(gip, diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfiguration.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfiguration.java index 1275c25..350a5f3 100644 --- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfiguration.java +++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfiguration.java @@ -137,7 +137,7 @@ public abstract class GlassfishConfiguration implements return new int[]{0,1}; } // glassfish-resources.xml for v6 - if (GlassFishVersion.ge(version, GlassFishVersion.GF_6)) { + if (GlassFishVersion.ge(version, GlassFishVersion.GF_6) || GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)) { return new int[]{0}; } // glassfish-resources.xml for v5 @@ -508,7 +508,8 @@ public abstract class GlassfishConfiguration implements "gfv3ee6wc", "gfv5ee8", "gfv510ee8", - "gfv6ee9" + "gfv6ee9", + "gfv610ee9" }; protected ASDDVersion getTargetAppServerVersion() { diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/AbstractHk2ConfigurationFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/AbstractHk2ConfigurationFactory.java index 680becc..265edda 100644 --- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/AbstractHk2ConfigurationFactory.java +++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/AbstractHk2ConfigurationFactory.java @@ -107,7 +107,10 @@ abstract class AbstractHk2ConfigurationFactory implements ModuleConfigurationFac ? instance.getVersion() : null; try { Hk2DeploymentManager evaluatedDm = null; - if(version != null && GlassFishVersion.ge(version, GlassFishVersion.GF_6)){ + if(version != null && GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)){ + evaluatedDm = (Hk2DeploymentManager) Hk2DeploymentFactory.createJakartaEe91() + .getDisconnectedDeploymentManager(instanceUrl); + } else if(version != null && GlassFishVersion.ge(version, GlassFishVersion.GF_6)){ evaluatedDm = (Hk2DeploymentManager) Hk2DeploymentFactory.createJakartaEe9() .getDisconnectedDeploymentManager(instanceUrl); } else if(version != null && GlassFishVersion.ge(version, GlassFishVersion.GF_5_1_0)){ @@ -127,6 +130,10 @@ abstract class AbstractHk2ConfigurationFactory implements ModuleConfigurationFac ? hk2dm : evaluatedDm; if (version != null + && GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)) { + retVal = new ModuleConfigurationImpl( + module, new Hk2Configuration(module, version), dm); + } else if (version != null && GlassFishVersion.ge(version, GlassFishVersion.GF_6)) { retVal = new ModuleConfigurationImpl( module, new Hk2Configuration(module, version), dm); diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Bundle.properties b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Bundle.properties index 190bb94..ee377c2 100644 --- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Bundle.properties +++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Bundle.properties @@ -47,6 +47,7 @@ LBL_V4ServerLibraries=GlassFish Server 4 Libraries LBL_V5ServerLibraries=GlassFish Server 5 Libraries LBL_V51ServerLibraries=GlassFish Server 5.1 Libraries LBL_V6ServerLibraries=GlassFish Server 6 Libraries +LBL_V610ServerLibraries=GlassFish Server 6.1 Libraries MSG_V1ServerPlatform=Unsupported GlassFish Server 1 Platform MSG_V2ServerPlatform=Unsupported GlassFish Server 2 Platform @@ -55,6 +56,7 @@ MSG_V4ServerPlatform=GlassFish Server 4 Platform MSG_V5ServerPlatform=GlassFish Server 5 Platform MSG_V51ServerPlatform=GlassFish Server 5.1 Platform MSG_V6ServerPlatform=GlassFish Server 6 Platform +MSG_V610ServerPlatform=GlassFish Server 6.1 Platform LBL_V3RunTimeDDCatalog=GlassFish Server 3 Catalog DESC_V3RunTimeDDCatalog=List of all the runtime descriptors DTDs for GlassFish Server 3 diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentFactory.java index 7c641d9..5b78616 100644 --- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentFactory.java +++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentFactory.java @@ -40,6 +40,7 @@ public class Hk2DeploymentFactory implements DeploymentFactory { private static Hk2DeploymentFactory ee8Instance; private static Hk2DeploymentFactory jakartaee8Instance; private static Hk2DeploymentFactory jakartaee9Instance; + private static Hk2DeploymentFactory jakartaee91Instance; private String[] uriFragments; private String version; private String displayName; @@ -136,6 +137,23 @@ public class Hk2DeploymentFactory implements DeploymentFactory { } /** + * Stubbed in for NetBeans 12.4, awaiting release of Jakarta EE 9.1. Once Released, + * this will need to be modified accordingly. + * @return + */ + public static synchronized DeploymentFactory createJakartaEe91() { + // FIXME -- these strings should come from some constant place + if (jakartaee9Instance == null) { + ServerUtilities tmp = ServerUtilities.getJakartaEe9Utilities(); + jakartaee9Instance = new Hk2DeploymentFactory(new String[]{"deployer:gfv610ee9:", "deployer:gfv610"}, "0.5", // NOI18N + NbBundle.getMessage(Hk2DeploymentFactory.class, "TXT_FactoryDisplayName")); // NOI18N + DeploymentFactoryManager.getInstance().registerDeploymentFactory(jakartaee9Instance); + jakartaee9Instance.setServerUtilities(tmp); + } + return jakartaee9Instance; + } + + /** * * @param uri * @return diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformFactory.java index 52e4cc8..1cc4953 100644 --- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformFactory.java +++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformFactory.java @@ -66,6 +66,7 @@ public class Hk2JavaEEPlatformFactory extends J2eePlatformFactory { private static final String V5_LOOKUP_KEY = "J2EE/DeploymentPlugins/gfv5ee8/Lookup"; private static final String V510_LOOKUP_KEY = "J2EE/DeploymentPlugins/gfv510ee8/Lookup"; private static final String V6_LOOKUP_KEY = "J2EE/DeploymentPlugins/gfv6ee9/Lookup"; + private static final String V610_LOOKUP_KEY = "J2EE/DeploymentPlugins/gfv610ee9/Lookup"; /** GlassFish JavaEE platform factory singleton object. */ private static volatile Hk2JavaEEPlatformFactory instance; @@ -101,7 +102,10 @@ public class Hk2JavaEEPlatformFactory extends J2eePlatformFactory { */ private static String getDisplayName(final GlassFishVersion version) { final int ord = version.ordinal(); - if(ord >= GlassFishVersion.GF_6.ordinal()) { + if(ord >= GlassFishVersion.GF_6_1_0.ordinal()) { + return NbBundle.getMessage( + Hk2JavaEEPlatformFactory.class, "MSG_V610ServerPlatform"); + } else if(ord >= GlassFishVersion.GF_6.ordinal()) { return NbBundle.getMessage( Hk2JavaEEPlatformFactory.class, "MSG_V6ServerPlatform"); } else if(ord >= GlassFishVersion.GF_5_1_0.ordinal()) { @@ -135,7 +139,10 @@ public class Hk2JavaEEPlatformFactory extends J2eePlatformFactory { */ private static String getLibraryName(final GlassFishVersion version) { final int ord = version.ordinal(); - if (ord >= GlassFishVersion.GF_6.ordinal()) { + if (ord >= GlassFishVersion.GF_6_1_0.ordinal()) { + return NbBundle.getMessage( + Hk2JavaEEPlatformFactory.class, "LBL_V610ServerLibraries"); + } else if (ord >= GlassFishVersion.GF_6.ordinal()) { return NbBundle.getMessage( Hk2JavaEEPlatformFactory.class, "LBL_V6ServerLibraries"); } else if (ord >= GlassFishVersion.GF_5_1_0.ordinal()) { @@ -169,7 +176,9 @@ public class Hk2JavaEEPlatformFactory extends J2eePlatformFactory { */ private static String getLookupKey(final GlassFishVersion version) { final int ord = version.ordinal(); - if (ord >= GlassFishVersion.GF_6.ordinal()){ + if (ord >= GlassFishVersion.GF_6_1_0.ordinal()){ + return V610_LOOKUP_KEY; + } else if (ord >= GlassFishVersion.GF_6.ordinal()){ return V6_LOOKUP_KEY; } else if (ord >= GlassFishVersion.GF_5_1_0.ordinal()){ return V510_LOOKUP_KEY; diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2OptionalFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2OptionalFactory.java index 169316a..6ab8505 100644 --- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2OptionalFactory.java +++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2OptionalFactory.java @@ -86,6 +86,12 @@ public class Hk2OptionalFactory extends OptionalDeploymentManagerFactory { t, true); } + public static Hk2OptionalFactory createJakartaEe91() { + ServerUtilities t = ServerUtilities.getJakartaEe91Utilities(); + return null == t ? null : new Hk2OptionalFactory(Hk2DeploymentFactory.createJakartaEe91(), + t, true); + } + @Override public StartServer getStartServer(DeploymentManager dm) { return new Hk2StartServer(dm); diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/layer.xml b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/layer.xml index 44be18e..fbbd790 100644 --- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/layer.xml +++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/layer.xml @@ -138,14 +138,14 @@ <file name="WEB-INF\sun-web.xml"/> <file name="WEB-INF\glassfish-web.xml"/> <file name="WEB-INF\glassfish-resources.xml"/> - </folder> + </folder> <folder name="EJB"> <file name="META-INF\sun-ejb-jar.xml"/> <file name="META-INF\sun-cmp-mappings.xml"/> <file name="META-INF\glassfish-ejb-jar.xml"/> <file name="META-INF\glassfish-cmp-mappings.xml"/> <file name="META-INF\glassfish-resources.xml"/> - </folder> + </folder> <folder name="EAR"> <file name="META-INF\sun-application.xml"/> <file name="META-INF\glassfish-application.xml"/> @@ -199,14 +199,14 @@ <file name="WEB-INF\sun-web.xml"/> <file name="WEB-INF\glassfish-web.xml"/> <file name="WEB-INF\glassfish-resources.xml"/> - </folder> + </folder> <folder name="EJB"> <file name="META-INF\sun-ejb-jar.xml"/> <file name="META-INF\sun-cmp-mappings.xml"/> <file name="META-INF\glassfish-ejb-jar.xml"/> <file name="META-INF\glassfish-cmp-mappings.xml"/> <file name="META-INF\glassfish-resources.xml"/> - </folder> + </folder> <folder name="EAR"> <file name="META-INF\sun-application.xml"/> <file name="META-INF\glassfish-application.xml"/> @@ -284,8 +284,69 @@ <file name="META-INF\glassfish-resources.xml"/> </folder> </folder> + </folder> + <folder name="gfv610ee9"> + <file name="Descriptor" url="nbdepjakartaee9.xml"/> + <!-- --> + <file name="Factory.instance"> + <attr name="urlPattern" stringvalue="^\[.*deployer:gfv610ee9[w]?[c]?:.*$"/> + <attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory.create"/> + <attr name="delegate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory.createJakartaEe91"/> + <attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory"/> + <attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/> + </file> + <file name="J2eePlatformFactory.instance"> + <attr name="instanceCreate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2JavaEEPlatformFactory.getFactory"/> + <attr name="instanceClass" stringvalue="org.netbeans.modules.glassfish.javaee.Hk2JavaEEPlatformFactory"/> + <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformFactory"/> + </file> + <file name="OptionalFactory.instance"> + <attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyOptionalFactory.create"/> + <attr name="delegate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory.createJakartaEe91"/> + <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.OptionalDeploymentManagerFactory"/> + </file> + <file name="ModuleConfigFactory.instance"> + <attr name="instanceCreate" newvalue="org.netbeans.modules.glassfish.javaee.Hk2ModuleConfigFactory"/> + <attr name="instanceClass" stringvalue="org.netbeans.modules.glassfish.javaee.Hk2ModuleConfigFactory"/> + <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfigurationFactory"/> + </file> + <file name="J2eeVerifierSupport.instance"> + <attr name="instanceCreate" newvalue="org.netbeans.modules.glassfish.javaee.verifier.VerifierImpl"/> + <attr name="instanceClass" stringvalue="org.netbeans.modules.glassfish.javaee.verifier.VerifierImpl"/> + <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.VerifierSupport"/> + </file> + <!-- --> + <folder name="DeploymentFileNames"> + <folder name="WAR"> + <file name="WEB-INF\sun-web.xml"/> + <file name="WEB-INF\glassfish-web.xml"/> + <file name="WEB-INF\glassfish-resources.xml"/> + </folder> + <folder name="EJB"> + <file name="META-INF\sun-ejb-jar.xml"/> + <file name="META-INF\sun-cmp-mappings.xml"/> + <file name="META-INF\glassfish-ejb-jar.xml"/> + <file name="META-INF\glassfish-cmp-mappings.xml"/> + <file name="META-INF\glassfish-resources.xml"/> + </folder> + <folder name="EAR"> + <file name="META-INF\sun-application.xml"/> + <file name="META-INF\glassfish-application.xml"/> + <file name="META-INF\glassfish-resources.xml"/> + </folder> + <folder name="RAR"> + <file name="META-INF\sun-ra.xml"/> + <file name="META-INF\glassfish-ra.xml"/> + <file name="META-INF\glassfish-resources.xml"/> + </folder> + <folder name="CAR"> + <file name="META-INF\sun-application-client.xml"/> + <file name="META-INF\glassfish-application-client.xml"/> + <file name="META-INF\glassfish-resources.xml"/> + </folder> + </folder> </folder> - </folder> + </folder> </folder> <folder name="Plugins"> diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdepjakartaee91.xml b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdepjakartaee91.xml new file mode 100644 index 0000000..9478759 --- /dev/null +++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdepjakartaee91.xml @@ -0,0 +1,54 @@ +<netbeans-deployment> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + <!-- + The icon element contains a path to the icon to be used to present the server + in the server registry. + --> + <icon>org/netbeans/modules/glassfish/common/resources/server</icon> + + <!-- + The disconnected-string element contains the String parameter to DeploymentFactory.getDisconnectedDeploymentManager() + --> + <disconnected-string>deployer:gfv610ee9</disconnected-string> + + <!-- + The container-limitation element modifies a plugin to say that not all j2ee deployments are valid. + For example, a web-only server would include + <container-limitation> <war-deploy/> </container-limitation> + to indicate that only war deployments are accepted. + If a container-limitation element is not present, all j2ee deployments are assumed valid. + If a container-limitation element is present, then only j2ee deployment types explicitly + mentioned are allowed. + --> + <!-- v3 ee6 has no limitations... + <container-limitation> + <ear-deploy/> + <war-deploy/> + <ejbjar-deploy/> + </container-limitation> + --> + <web-context-root> + <xpath>/</xpath> + <prop-name>contextRoot</prop-name> + </web-context-root> + +</netbeans-deployment> diff --git a/enterprise/glassfish.tooling/nbproject/org-netbeans-modules-glassfish-tooling.sig b/enterprise/glassfish.tooling/nbproject/org-netbeans-modules-glassfish-tooling.sig index 8b8e830..94d1caa 100644 --- a/enterprise/glassfish.tooling/nbproject/org-netbeans-modules-glassfish-tooling.sig +++ b/enterprise/glassfish.tooling/nbproject/org-netbeans-modules-glassfish-tooling.sig @@ -1394,6 +1394,7 @@ fld public final static org.netbeans.modules.glassfish.tooling.data.GlassFishVer fld public final static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion GF_5_0_1 fld public final static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion GF_5_1_0 fld public final static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion GF_6 +fld public final static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion GF_6_1_0 meth public boolean equals(org.netbeans.modules.glassfish.tooling.data.GlassFishVersion) meth public boolean equalsMajorMinor(org.netbeans.modules.glassfish.tooling.data.GlassFishVersion) meth public java.lang.String toFullString() @@ -1414,7 +1415,7 @@ meth public static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion meth public static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion valueOf(java.lang.String) meth public static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion[] values() supr java.lang.Enum<org.netbeans.modules.glassfish.tooling.data.GlassFishVersion> -hfds GF_1_STR,GF_1_STR_NEXT,GF_2_1_1_STR,GF_2_1_1_STR_NEXT,GF_2_1_STR,GF_2_1_STR_NEXT,GF_2_STR,GF_2_STR_NEXT,GF_3_0_1_STR,GF_3_0_1_STR_NEXT,GF_3_1_1_STR,GF_3_1_1_STR_NEXT,GF_3_1_2_2_STR,GF_3_1_2_3_STR,GF_3_1_2_4_STR,GF_3_1_2_5_STR,GF_3_1_2_STR,GF_3_1_2_STR_NEXT,GF_3_1_STR,GF_3_1_STR_NEXT,GF_3_STR,GF_3_STR_NEXT,GF_4_0_1_STR,GF_4_0_1_STR_NEXT,GF_4_1_1_STR,GF_4_1_1_STR_NEXT,GF_4_1_2_STR,GF_4_1_2_STR_NEXT,GF_4_1_STR,GF_4_1_STR_NEXT,GF_4_STR,GF_4_STR_NEXT,GF_5_0_1_STR,GF_5_0_1_STR_NEXT,GF_5_1 [...] +hfds GF_1_STR,GF_1_STR_NEXT,GF_2_1_1_STR,GF_2_1_1_STR_NEXT,GF_2_1_STR,GF_2_1_STR_NEXT,GF_2_STR,GF_2_STR_NEXT,GF_3_0_1_STR,GF_3_0_1_STR_NEXT,GF_3_1_1_STR,GF_3_1_1_STR_NEXT,GF_3_1_2_2_STR,GF_3_1_2_3_STR,GF_3_1_2_4_STR,GF_3_1_2_5_STR,GF_3_1_2_STR,GF_3_1_2_STR_NEXT,GF_3_1_STR,GF_3_1_STR_NEXT,GF_3_STR,GF_3_STR_NEXT,GF_4_0_1_STR,GF_4_0_1_STR_NEXT,GF_4_1_1_STR,GF_4_1_1_STR_NEXT,GF_4_1_2_STR,GF_4_1_2_STR_NEXT,GF_4_1_STR,GF_4_1_STR_NEXT,GF_4_STR,GF_4_STR_NEXT,GF_5_0_1_STR,GF_5_0_1_STR_NEXT,GF_5_1 [...] CLSS public org.netbeans.modules.glassfish.tooling.data.IdeContext cons public init() 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 bdd3149..dd28724 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 @@ -81,7 +81,9 @@ public enum GlassFishVersion { /** GlassFish 5.1.0 */ GF_5_1_0 ((short) 5, (short) 1, (short) 0, (short) 0, GlassFishVersion.GF_5_1_0_STR), /** GlassFish 6. */ - GF_6 ((short) 6, (short) 0, (short) 0, (short) 0, GlassFishVersion.GF_6_STR); + GF_6 ((short) 6, (short) 0, (short) 0, (short) 0, GlassFishVersion.GF_6_STR), + /** GlassFish 6.1.0 */ + GF_6_1_0 ((short) 6, (short) 1, (short) 0, (short) 0, GlassFishVersion.GF_6_1_0_STR); //////////////////////////////////////////////////////////////////////////// // Class attributes // //////////////////////////////////////////////////////////////////////////// @@ -191,10 +193,14 @@ public enum GlassFishVersion { static final String GF_5_1_0_STR = "5.1.0"; /** Additional <code>String</code> representations of GF_5_1_0 value. */ static final String GF_5_1_0_STR_NEXT[] = {"5.1.0", "5.1.0.0"}; - /** A <code>String</code> representation of GF_^ value. */ + /** A <code>String</code> representation of GF_6 value. */ static final String GF_6_STR = "6"; /** Additional <code>String</code> representations of GF_6 value. */ static final String GF_6_STR_NEXT[] = {"6.0", "6.0.0"}; + /** A <code>String</code> representation of GF_6_1_0 value. */ + static final String GF_6_1_0_STR = "6.1.0"; + /** Additional <code>String</code> representations of GF_6_1_0 value. */ + static final String GF_6_1_0_STR_NEXT[] = {"6.1", "6.1.0"}; /** * Stored <code>String</code> values for backward <code>String</code> @@ -225,6 +231,7 @@ public enum GlassFishVersion { initStringValuesMapFromArray(GF_5, GF_5_STR_NEXT); initStringValuesMapFromArray(GF_5_1_0, GF_5_1_0_STR_NEXT); initStringValuesMapFromArray(GF_6, GF_6_STR_NEXT); + initStringValuesMapFromArray(GF_6_1_0, GF_6_1_0_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 90efe45..8d9a845 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 @@ -40,7 +40,7 @@ import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion; * @author Tomas Kraus */ public class ConfigBuilderProvider { - + //////////////////////////////////////////////////////////////////////////// // Class attributes // //////////////////////////////////////////////////////////////////////////// @@ -63,20 +63,30 @@ public class ConfigBuilderProvider { private static final Config.Next CONFIG_V5 = new Config.Next(GlassFishVersion.GF_5, ConfigBuilderProvider.class.getResource("GlassFishV5.xml")); - + /** Library builder configuration since GlassFish 5.0.1. */ private static final Config.Next CONFIG_V5_0_1 = new Config.Next(GlassFishVersion.GF_5_0_1, ConfigBuilderProvider.class.getResource("GlassFishV5.xml")); - + /** Library builder configuration since GlassFish 5.1. */ private static final Config.Next CONFIG_V5_1 = new Config.Next(GlassFishVersion.GF_5_1_0, ConfigBuilderProvider.class.getResource("GlassFishV5_1_0.xml")); + /** Library builder configuration since GlassFish 6.0. */ + private static final Config.Next CONFIG_V6 + = new Config.Next(GlassFishVersion.GF_6, + ConfigBuilderProvider.class.getResource("GlassFishV6.xml")); + + /** Library builder configuration since GlassFish 6.1.0. */ + private static final Config.Next CONFIG_V6_1_0 + = new Config.Next(GlassFishVersion.GF_6_1_0, + ConfigBuilderProvider.class.getResource("GlassFishV6_1_0.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); + = new Config(CONFIG_V3, CONFIG_V4, CONFIG_V4_1, CONFIG_V5, CONFIG_V5_0_1, CONFIG_V5_1, CONFIG_V6, CONFIG_V6_1_0); /** Builders array for each server instance. */ private static final Map<GlassFishServer, ConfigBuilder> builders diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6.xml index 58dd2b2..b25bfad 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6.xml +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6.xml @@ -94,7 +94,7 @@ <library id="JAX-RS"> <classpath> <fileset dir="modules"> - <include name="javax.ws.rs-api.jar"/> + <include name="jakarta.ws.rs-api.jar"/> </fileset> </classpath> <javadocs> diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml similarity index 94% copy from enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6.xml copy to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml index 58dd2b2..c53f0d8 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6.xml +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml @@ -70,7 +70,7 @@ </fileset> </classpath> <javadocs> - <lookup path="docs/javaee-doc-api.jar"/> + <lookup path="docs/jakartaee9-doc-api.jar"/> </javadocs> <sources> </sources> @@ -86,7 +86,7 @@ </fileset> </classpath> <javadocs> - <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/2.0-m05-2/jersey-documentation-2.0-m05-2-docbook.zip"/> + <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/3.0.1/jersey-documentation-3.0.1-docbook.zip"/> </javadocs> <sources> </sources> @@ -94,7 +94,7 @@ <library id="JAX-RS"> <classpath> <fileset dir="modules"> - <include name="javax.ws.rs-api.jar"/> + <include name="jakarta.ws.rs-api.jar"/> </fileset> </classpath> <javadocs> diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEEProfile.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEEProfile.java index 8c88c91..2681303 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEEProfile.java +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEEProfile.java @@ -127,7 +127,7 @@ public enum JavaEEProfile { v1_8("1.8"), /** JakartaEE 8.0. */ v8_0_0("8.0.0"), - /** JakartaEE 8.0. */ + /** JakartaEE 9.0. */ v9_0_0("9.0.0"); /** JavaEE profile type name. */ diff --git a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/layer.xml b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/layer.xml index 417cd64..11fea17 100644 --- a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/layer.xml +++ b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/layer.xml @@ -58,6 +58,7 @@ <attr name="config-GlassFishEE8/Instances/" boolvalue="true"/> <attr name="config-GlassFishJakartaEE8/Instances/" boolvalue="true"/> <attr name="config-GlassFishJakartaEE9/Instances/" boolvalue="true"/> + <!--attr name="config-GlassFishJakartaEE91/Instances/" boolvalue="true"/--> <attr name="config-GlassFishEE6WC/Instances/" boolvalue="true"/> </file> </folder> diff --git a/enterprise/maven.j2ee/test/unit/src/org/netbeans/modules/maven/j2ee/JavaEEMavenTestBase.java b/enterprise/maven.j2ee/test/unit/src/org/netbeans/modules/maven/j2ee/JavaEEMavenTestBase.java index abf934a..7a7972d 100644 --- a/enterprise/maven.j2ee/test/unit/src/org/netbeans/modules/maven/j2ee/JavaEEMavenTestBase.java +++ b/enterprise/maven.j2ee/test/unit/src/org/netbeans/modules/maven/j2ee/JavaEEMavenTestBase.java @@ -54,6 +54,7 @@ public abstract class JavaEEMavenTestBase extends NbTestCase { public final String GLASSFISH = "gfv5ee8"; //NOI18N public final String ECLIPSEGLASSFISH = "gfv510ee8"; //NOI18N public final String ECLIPSEGLASSFISH6 = "gfv6ee9"; //NOI18N + public final String ECLIPSEGLASSFISH610 = "gfv610ee9"; //NOI18N public final String TOMCAT = "Tomcat"; //NOI18N public final String JBOSS = "JBoss"; //NOI18N diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java index 46b0d44..681262f 100644 --- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java +++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java @@ -741,7 +741,7 @@ public class JSFFrameworkProvider extends WebFrameworkProvider { String shortName; try { shortName = Deployment.getDefault().getServerInstance(serverInstanceID).getServerID(); - if ("gfv6ee9".equals(shortName) || "gfv510ee8".equals(shortName) || "gfv5ee8".equals(shortName) || "gfv5".equals(shortName) || "gfv3ee6".equals(shortName) || "gfv3".equals(shortName)) { + if ("gfv610ee9".equals(shortName) || "gfv6ee9".equals(shortName) || "gfv510ee8".equals(shortName) || "gfv5ee8".equals(shortName) || "gfv5".equals(shortName) || "gfv3ee6".equals(shortName) || "gfv3".equals(shortName)) { return true; } } catch (InstanceRemovedException ex) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists