Add Support for Jakarta EE 12 & GlassFish 9

contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JpaSupportImpl.java

@@ -38,26 +38,37 @@ public JpaSupportImpl(JBJ2eePlatformFactory.J2eePlatformImplImpl platformImpl) {
     @Override
     public JpaProvider getDefaultProvider() {
         String defaultProvider = platformImpl.getDefaultJpaProvider();
-        boolean jpa2 = platformImpl.isJpa2Available();
-        return JpaProviderFactory.createJpaProvider(defaultProvider, true, true, jpa2, false, false, false, false, false);
+        final boolean isDefault = true, isJpa10 = true;
+        boolean isJpa20 = platformImpl.isJpa2Available();
+        final boolean isJpa21 = false, isJpa22 = false, isJpa30 = false, isJpa31 = false, isJpa32 = false, isJpa40 = false;
+        return JpaProviderFactory.createJpaProvider(defaultProvider, isDefault, 
+                isJpa10, isJpa20, isJpa21, isJpa22, isJpa30, isJpa31, isJpa32, isJpa40);
     }
 
     @Override
     public Set<JpaProvider> getProviders() {
         String defaultProvider = platformImpl.getDefaultJpaProvider();
-        boolean jpa2 = platformImpl.isJpa2Available();
-        Set<JpaProvider> providers = new HashSet<JpaProvider>();
+        final boolean isJpa10 = true;
+        boolean isJpa20 = platformImpl.isJpa2Available();
+        final boolean isJpa21 = false, isJpa22 = false, isJpa30 = false, isJpa31 = false, isJpa32 = false, isJpa40 = false;
+        Set<JpaProvider> providers = new HashSet<>(8);
         if (platformImpl.containsPersistenceProvider(JBJ2eePlatformFactory.HIBERNATE_JPA_PROVIDER)) {
-            providers.add(JpaProviderFactory.createJpaProvider(JBJ2eePlatformFactory.HIBERNATE_JPA_PROVIDER, 
-                    JBJ2eePlatformFactory.HIBERNATE_JPA_PROVIDER.equals(defaultProvider), true, jpa2, false, false, false, false, false));
+            providers.add(JpaProviderFactory.createJpaProvider(
+                    JBJ2eePlatformFactory.HIBERNATE_JPA_PROVIDER, 
+                    JBJ2eePlatformFactory.HIBERNATE_JPA_PROVIDER.equals(defaultProvider),
+                    isJpa10, isJpa20, isJpa21, isJpa22, isJpa30, isJpa31, isJpa32, isJpa40));
         }
         if (platformImpl.containsPersistenceProvider(JBJ2eePlatformFactory.TOPLINK_JPA_PROVIDER)) {
-            providers.add(JpaProviderFactory.createJpaProvider(JBJ2eePlatformFactory.TOPLINK_JPA_PROVIDER, 
-                    JBJ2eePlatformFactory.TOPLINK_JPA_PROVIDER.equals(defaultProvider), true, false, false, false, false, false, false));
+            providers.add(JpaProviderFactory.createJpaProvider(
+                    JBJ2eePlatformFactory.TOPLINK_JPA_PROVIDER, 
+                    JBJ2eePlatformFactory.TOPLINK_JPA_PROVIDER.equals(defaultProvider), 
+                    isJpa10, isJpa20, isJpa21, isJpa22, isJpa30, isJpa31, isJpa32, isJpa40));
         }
         if (platformImpl.containsPersistenceProvider(JBJ2eePlatformFactory.KODO_JPA_PROVIDER)) {
-            providers.add(JpaProviderFactory.createJpaProvider(JBJ2eePlatformFactory.KODO_JPA_PROVIDER, 
-                    JBJ2eePlatformFactory.KODO_JPA_PROVIDER.equals(defaultProvider), true, false, false, false, false, false, false));
+            providers.add(JpaProviderFactory.createJpaProvider(
+                    JBJ2eePlatformFactory.KODO_JPA_PROVIDER, 
+                    JBJ2eePlatformFactory.KODO_JPA_PROVIDER.equals(defaultProvider), 
+                    isJpa10, isJpa20, isJpa21, isJpa22, isJpa30, isJpa31, isJpa32, isJpa40));
         }
         return providers;
     }

contrib/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/j2ee/JpaSupportImpl.java

@@ -38,20 +38,30 @@ public JpaSupportImpl(WLJ2eePlatformFactory.J2eePlatformImplImpl platformImpl) {
     @Override
     public JpaProvider getDefaultProvider() {
         String defaultProvider = platformImpl.getDefaultJpaProvider();
-        return JpaProviderFactory.createJpaProvider(defaultProvider, true, true,
-                platformImpl.isJpa2Available(), platformImpl.isJpa21Available(), false, false, false, false);
+        final boolean isDefault = true, isJpa10 = true;
+        final boolean isJpa20 = platformImpl.isJpa2Available();
+        final boolean isJpa21 = platformImpl.isJpa21Available();
+        final boolean isJpa22 = false, isJpa30 = false, isJpa31 = false, isJpa32 = false, isJpa40 = false;
+        return JpaProviderFactory.createJpaProvider(defaultProvider, isDefault, 
+                isJpa10, isJpa20, isJpa21, isJpa22, isJpa30, isJpa31, isJpa32, isJpa40);
     }
 
     @Override
     public Set<JpaProvider> getProviders() {
         String defaultProvider = platformImpl.getDefaultJpaProvider();
-        Set<JpaProvider> providers = new HashSet<JpaProvider>();
-        providers.add(JpaProviderFactory.createJpaProvider(WLJ2eePlatformFactory.OPENJPA_JPA_PROVIDER,
-                WLJ2eePlatformFactory.OPENJPA_JPA_PROVIDER.equals(defaultProvider), true, false, false, false, false, false, false));
+        final boolean isJpa10 = true;
+        final boolean isJpa20 = platformImpl.isJpa2Available();
+        final boolean isJpa21 = platformImpl.isJpa21Available();
+        final boolean isJpa22 = false, isJpa30 = false, isJpa31 = false, isJpa32 = false, isJpa40 = false;
+        Set<JpaProvider> providers = new HashSet<>(4);
+        providers.add(JpaProviderFactory.createJpaProvider(
+                WLJ2eePlatformFactory.OPENJPA_JPA_PROVIDER,
+                WLJ2eePlatformFactory.OPENJPA_JPA_PROVIDER.equals(defaultProvider), 
+                isJpa10, isJpa20, isJpa21, isJpa22, isJpa30, isJpa31, isJpa32, isJpa40));
         providers.add(JpaProviderFactory.createJpaProvider(
                 WLJ2eePlatformFactory.ECLIPSELINK_JPA_PROVIDER,
                 WLJ2eePlatformFactory.ECLIPSELINK_JPA_PROVIDER.equals(defaultProvider), 
-                true, platformImpl.isJpa2Available(), platformImpl.isJpa21Available(), false, false, false, false));
+                isJpa10, isJpa20, isJpa21, isJpa22, isJpa30, isJpa31, isJpa32, isJpa40));
         return providers;
     }
 

enterprise/glassfish.common/nbproject/project.properties

@@ -16,7 +16,7 @@
 # under the License.
 
 javac.compilerargs=-Xlint -Xlint:-serial
-javac.release=11
+javac.release=17
 
 test.config.stableBTD.includes=**/*Test.class
 test.config.stableBTD.excludes=\

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

@@ -194,6 +194,7 @@ STR_7024_SERVER_NAME=GlassFish Server 7.0.24
 STR_7025_SERVER_NAME=GlassFish Server 7.0.25
 STR_710_SERVER_NAME=GlassFish Server 7.1.0
 STR_800_SERVER_NAME=GlassFish Server 8.0.0
+STR_900_SERVER_NAME=GlassFish Server 9.0.0
 
 # CommonServerSupport.java
 MSG_FLAKEY_NETWORK=<html>Network communication problem<br/>Could not establish \

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

@@ -70,6 +70,7 @@ public final class GlassfishInstanceProvider implements ServerInstanceProvider,
     public static final String JAKARTAEE91_DEPLOYER_FRAGMENT = "deployer:gfv610ee9";
     public static final String JAKARTAEE10_DEPLOYER_FRAGMENT = "deployer:gfv700ee10";
     public static final String JAKARTAEE11_DEPLOYER_FRAGMENT = "deployer:gfv800ee11";
+    public static final String JAKARTAEE12_DEPLOYER_FRAGMENT = "deployer:gfv900ee12";
     public static final String EE6WC_DEPLOYER_FRAGMENT = "deployer:gfv3ee6wc"; // NOI18N
     public static final String PRELUDE_DEPLOYER_FRAGMENT = "deployer:gfv3"; // NOI18N
     private static String EE6_INSTANCES_PATH = "/GlassFishEE6/Instances"; // NOI18N
@@ -80,6 +81,7 @@ public final class GlassfishInstanceProvider implements ServerInstanceProvider,
     private static String JAKARTAEE91_INSTANCES_PATH = "/GlassFishJakartaEE91/Instances"; // NOI18N
     private static String JAKARTAEE10_INSTANCES_PATH = "/GlassFishJakartaEE10/Instances"; // NOI18N
     private static String JAKARTAEE11_INSTANCES_PATH = "/GlassFishJakartaEE11/Instances"; // NOI18N
+    private static String JAKARTAEE12_INSTANCES_PATH = "/GlassFishJakartaEE12/Instances"; // NOI18N
     private static String EE6WC_INSTANCES_PATH = "/GlassFishEE6WC/Instances"; // NOI18N
 
     public static String PRELUDE_DEFAULT_NAME = "GlassFish_v3_Prelude"; //NOI18N
@@ -105,12 +107,12 @@ public static GlassfishInstanceProvider getProvider() {
                                     EE7_DEPLOYER_FRAGMENT, EE8_DEPLOYER_FRAGMENT, 
                                     JAKARTAEE8_DEPLOYER_FRAGMENT, JAKARTAEE9_DEPLOYER_FRAGMENT,
                                     JAKARTAEE91_DEPLOYER_FRAGMENT, JAKARTAEE10_DEPLOYER_FRAGMENT,
-                                    JAKARTAEE11_DEPLOYER_FRAGMENT},
+                                    JAKARTAEE11_DEPLOYER_FRAGMENT, JAKARTAEE12_DEPLOYER_FRAGMENT},
                             new String[]{EE6_INSTANCES_PATH, EE6WC_INSTANCES_PATH, 
                                     EE7_INSTANCES_PATH, EE8_INSTANCES_PATH, 
                                     JAKARTAEE8_INSTANCES_PATH, JAKARTAEE9_INSTANCES_PATH,
                                     JAKARTAEE91_INSTANCES_PATH, JAKARTAEE10_INSTANCES_PATH,
-                                    JAKARTAEE11_INSTANCES_PATH},
+                                    JAKARTAEE11_INSTANCES_PATH, JAKARTAEE12_INSTANCES_PATH},
                             null,
                             true,
                             new String[]{"--nopassword"}, // NOI18N

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

@@ -587,6 +587,17 @@ public enum ServerDetails {
         "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0/glassfish-8.0.0.zip", // NOI18N
         "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0/glassfish-8.0.0.zip", // NOI18N
         "http://www.eclipse.org/legal/epl-2.0" //NOI18N
+    ),
+
+    /**
+     * details for an instance of GlassFish Server 9.0.0
+     */
+    GLASSFISH_SERVER_9_0_0(NbBundle.getMessage(ServerDetails.class, "STR_900_SERVER_NAME", new Object[]{}), // NOI18N
+        GlassfishInstanceProvider.JAKARTAEE12_DEPLOYER_FRAGMENT,
+        GlassFishVersion.GF_9_0_0,
+        "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/9.0.0-M1/glassfish-9.0.0-M1.zip", // NOI18N
+        "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/9.0.0-M1/glassfish-9.0.0-M1.zip", // NOI18N
+        "http://www.eclipse.org/legal/epl-2.0" //NOI18N
     );
 
     /**

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

@@ -84,7 +84,10 @@ private static int autoregisterGlassFishInstance(String clusterDirValue, String
         String deployer = "deployer:gfv3ee6";
         String defaultDisplayNamePrefix = "GlassFish Server ";
         GlassFishVersion version = ServerUtils.getServerVersion(glassfishRoot);
-        if (GlassFishVersion.ge(version, GlassFishVersion.GF_8_0_0)) {
+        if (GlassFishVersion.ge(version, GlassFishVersion.GF_9_0_0)) {
+            deployer = "deployer:gfv900ee12";
+            config = "GlassFishJakartaEE12/Instances";
+        } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_8_0_0)) {
             deployer = "deployer:gfv800ee11";
             config = "GlassFishJakartaEE11/Instances";
         } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_7_0_0)) {

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

@@ -198,6 +198,9 @@ STR_710_SERVER_NAME=GlassFish Server 7.1.0
 STR_V8_FAMILY_NAME=GlassFish Server
 STR_800_SERVER_NAME=GlassFish Server 8.0.0
 
+STR_V9_FAMILY_NAME=GlassFish Server
+STR_900_SERVER_NAME=GlassFish Server 9.0.0
+
 LBL_SELECT_BITS=Select
 LBL_ChooseOne=Choose server to download:
 

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

@@ -85,6 +85,13 @@ public static GlassfishWizardProvider createJakartaEe11() {
                 "STR_V8_FAMILY_NAME", new Object[]{}) // NOI18N
         );
     }
+
+    public static GlassfishWizardProvider createJakartaEe12() {
+        return new GlassfishWizardProvider(
+                org.openide.util.NbBundle.getMessage(GlassfishWizardProvider.class,
+                "STR_V9_FAMILY_NAME", new Object[]{}) // NOI18N
+        );
+    }
 
     private final String displayName;
 

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

@@ -118,6 +118,12 @@ public static ServerUtilities getJakartaEe11Utilities() {
         return null == gip ? null : new ServerUtilities(gip,
                 GlassfishWizardProvider.createJakartaEe11());
     }
+
+    public static ServerUtilities getJakartaEe12Utilities() {
+        GlassfishInstanceProvider gip = GlassfishInstanceProvider.getProvider();
+        return null == gip ? null : new ServerUtilities(gip,
+                GlassfishWizardProvider.createJakartaEe12());
+    }
 
 //    public static ServerUtilities getEe6WCUtilities() {
 //        GlassfishInstanceProvider gip = GlassfishInstanceProvider.getProvider();

enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistrationTest.java

@@ -28,6 +28,22 @@
  */
 public class AutomaticRegistrationTest {
 
+    @Test
+    public void testRegistrationGF9() {
+        GlassFishVersion version = GlassFishVersion.GF_9_0_0;
+        if (GlassFishVersion.ge(version, GlassFishVersion.GF_9_0_0)) {
+            assertTrue("Success!", true);
+        } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_6)) {
+            fail("GF_6");
+        } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5_1_0)) {
+            fail("GF_5_1_0");
+        } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5)) {
+            fail("GF_5");
+        } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)) {
+            fail("GF_3_1");
+        }
+    }
+
     @Test
     public void testRegistrationGF8() {
         GlassFishVersion version = GlassFishVersion.GF_8_0_0;

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

@@ -88,6 +88,13 @@ public final class AppClientVersion extends J2EEBaseVersion {
         "11.0", 11000,	// NOI18N
         "11.0", 11000	// NOI18N
         );
+
+    /** Represents application-client version 12.0
+     */
+    public static final AppClientVersion APP_CLIENT_12_0 = new AppClientVersion(
+        "12.0", 12000,	// NOI18N
+        "12.0", 12000	// NOI18N
+        );
 
     /** Creates a new instance of AppClientVersion 
      */
@@ -102,6 +109,7 @@ private AppClientVersion(String version, int nv, String specVersion, int nsv) {
      *     than the version passed in as an argument.
      *  @throws ClassCastException if obj is not a AppClientVersion object.
      */
+    @Override
     public int compareTo(Object obj) {
         AppClientVersion target = (AppClientVersion) obj;
         return numericCompare(target);
@@ -128,6 +136,8 @@ public static AppClientVersion getAppClientVersion(String version) {
             result = APP_CLIENT_10_0;
         } else if(APP_CLIENT_11_0.toString().equals(version)) {
             result = APP_CLIENT_11_0;
+        } else if(APP_CLIENT_12_0.toString().equals(version)) {
+            result = APP_CLIENT_12_0;
         }
 
         return result;

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

@@ -88,6 +88,13 @@ public final class ApplicationVersion extends J2EEBaseVersion {
         "11.0", 11000,	// NOI18N
         "11.0", 11000	// NOI18N
         );
+
+    /** Represents application version 12.0
+     */
+    public static final ApplicationVersion APPLICATION_12_0 = new ApplicationVersion(
+        "12.0", 12000,	// NOI18N
+        "12.0", 12000	// NOI18N
+        );
 
     /** Creates a new instance of ApplicationVersion 
      */
@@ -102,6 +109,7 @@ private ApplicationVersion(String version, int nv, String specVersion, int nsv)
      *     than the version passed in as an argument.
      *  @throws ClassCastException if obj is not a ApplicationVersion object.
      */
+    @Override
     public int compareTo(Object obj) {
         ApplicationVersion target = (ApplicationVersion) obj;
         return numericCompare(target);
@@ -124,8 +132,12 @@ public static ApplicationVersion getApplicationVersion(String version) {
             result = APPLICATION_8_0;
         } else if(APPLICATION_9_0.toString().equals(version)) {
             result = APPLICATION_9_0;
-        }else if(APPLICATION_10_0.toString().equals(version)) {
+        } else if(APPLICATION_10_0.toString().equals(version)) {
             result = APPLICATION_10_0;
+        } else if(APPLICATION_11_0.toString().equals(version)) {
+            result = APPLICATION_11_0;
+        } else if(APPLICATION_12_0.toString().equals(version)) {
+            result = APPLICATION_12_0;
         }
 
         return result;

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

@@ -89,6 +89,14 @@ public final class EjbJarVersion extends J2EEBaseVersion {
             "4.0.1", 4010, // NOI18N
             "10.0", 10000 // NOI18N
     );
+
+    /**
+     * Represents ejbjar version 4.1
+     */
+    public static final EjbJarVersion EJBJAR_4_1 = new EjbJarVersion(
+            "4.1", 4100, // NOI18N
+            "12.0", 12000 // NOI18N
+    );
 
     /** Creates a new instance of EjbJarVersion 
      */
@@ -126,6 +134,10 @@ public static EjbJarVersion getEjbJarVersion(String version) {
             result = EJBJAR_3_2_6;
         } else if(EJBJAR_4_0.toString().equals(version)) {
             result = EJBJAR_4_0;
+        } else if(EJBJAR_4_0_1.toString().equals(version)) {
+            result = EJBJAR_4_0_1;
+        } else if(EJBJAR_4_1.toString().equals(version)) {
+            result = EJBJAR_4_1;
         }
 
         return result;

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

@@ -70,7 +70,7 @@
 import org.openide.util.RequestProcessor;
 
 /**
- * Basic Java/Jakarta EE server configuration API support for V2-V8 plugins.
+ * Basic Java/Jakarta EE server configuration API support for V2-V9 plugins.
  * <p/>
  * @author Peter Williams, Tomas Kraus
  */
@@ -489,7 +489,8 @@ void internalSetAppServerVersion(ASDDVersion asVersion) {
         "gfv6ee9",
         "gfv610ee9",
         "gfv700ee10",
-        "gfv800ee11"
+        "gfv800ee11",
+        "gfv900ee12"
     };
 
     protected ASDDVersion getTargetAppServerVersion() {
@@ -542,7 +543,13 @@ static ASDDVersion getInstalledAppServerVersionFromDirectory(File asInstallFolde
         boolean geGF6 = false;
         boolean geGF7 = false;
         boolean geGF8 = false;
-        if(schemaFolder.exists()){
+        boolean geGF9 = false;
+        if(schemaFolder.exists()) {
+            if(new File(schemaFolder, "jakartaee12.xsd").exists() &&
+                    new File(dtdFolder, "glassfish-web-app_3_0-1.dtd").exists()){
+              geGF9 = true;
+              return ASDDVersion.GLASSFISH_9;
+            }
             if(new File(schemaFolder, "jakartaee11.xsd").exists() &&
                     new File(dtdFolder, "glassfish-web-app_3_0-1.dtd").exists()){
               geGF8 = true;
@@ -564,7 +571,7 @@ static ASDDVersion getInstalledAppServerVersionFromDirectory(File asInstallFolde
               return ASDDVersion.GLASSFISH_5_1;
             }
         }
-        if (!geGF5 && !geGF6 && !geGF7 && !geGF8 && dtdFolder.exists()) {
+        if (!geGF5 && !geGF6 && !geGF7 && !geGF8 && !geGF9 && dtdFolder.exists()) {
             if (new File(dtdFolder, "glassfish-web-app_3_0-1.dtd").exists()) {
                 return ASDDVersion.SUN_APPSERVER_10_1;
             }

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

@@ -97,6 +97,12 @@ public final class J2EEVersion extends J2EEBaseVersion {
     public static final J2EEVersion JAKARTAEE_11_0 = new J2EEVersion(
             "11.0.0", 110000,    // NOI18N
             "11.0.0", 110000);   // NOI18N
+
+    /** Represents Jakarta EE version 12.0.0
+     */
+    public static final J2EEVersion JAKARTAEE_12_0 = new J2EEVersion(
+            "12.0.0", 120000,    // NOI18N
+            "12.0.0", 120000);   // NOI18N
 
     /** Creates a new instance of J2EEVersion
      */
@@ -141,6 +147,8 @@ public static J2EEVersion getJ2EEVersion(String version) {
             result = JAKARTAEE_10_0;
         } else if(JAKARTAEE_11_0.toString().equals(version)) {
             result = JAKARTAEE_11_0;
+        } else if(JAKARTAEE_12_0.toString().equals(version)) {
+            result = JAKARTAEE_12_0;
         }
 
         return result;