You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by pe...@apache.org on 2023/02/13 19:45:25 UTC

[netbeans] branch master updated: Add support for Glassfish 7.0.1 (#5466)

This is an automated email from the ASF dual-hosted git repository.

pepness 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 e13155a071 Add support for Glassfish 7.0.1 (#5466)
e13155a071 is described below

commit e13155a071bb061e94c9e2eee4f72b232236ee8f
Author: José Contreras <pe...@apache.org>
AuthorDate: Mon Feb 13 13:45:17 2023 -0600

    Add support for Glassfish 7.0.1 (#5466)
    
    - Add missing validations for servlet 5 and 6
    - Add missing glassfish 4 objects in ASDDVersion class
    - Remove ancient comment, there is already logic to support lookup keys
      and deployers for glassfish version 3 and upward
---
 .../modules/glassfish/common/Bundle.properties     |  1 +
 .../modules/glassfish/common/ServerDetails.java    | 18 ++++++-
 .../eecommon/api/config/J2eeModuleHelper.java      | 26 ++++++++++
 .../eecommon/api/config/ServletVersion.java        |  9 ++++
 .../glassfish/javaee/Hk2DeploymentFactory.java     |  2 +-
 .../glassfish/javaee/Hk2JavaEEPlatformFactory.java | 17 +++----
 .../glassfish/tooling/data/GlassFishVersion.java   | 12 ++++-
 .../server/config/ConfigBuilderProvider.java       |  8 +++-
 .../tooling/data/GlassFishVersionTest.java         |  7 ++-
 .../modules/j2ee/sun/dd/api/ASDDVersion.java       | 56 +++++++++++++++++++++-
 10 files changed, 136 insertions(+), 20 deletions(-)

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 194f03b27b..cf864a7f6e 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
@@ -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 \
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 dc23aa60b7..1a153bfe46 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
@@ -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
     );
 
@@ -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,
@@ -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,
@@ -396,6 +409,7 @@ public enum ServerDetails {
                 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;
             }
         }
diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2eeModuleHelper.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2eeModuleHelper.java
index 15c72ffd07..26855cab1b 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2eeModuleHelper.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2eeModuleHelper.java
@@ -232,6 +232,10 @@ public abstract class J2eeModuleHelper {
                 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;
         }
@@ -265,6 +269,12 @@ public abstract class J2eeModuleHelper {
                 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;
         }
@@ -296,6 +306,14 @@ public abstract class J2eeModuleHelper {
                 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;
         }
@@ -327,6 +345,14 @@ public abstract class J2eeModuleHelper {
                 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;
         }
diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ServletVersion.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ServletVersion.java
index e2ac6ee3a6..e9b3ce87c0 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ServletVersion.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ServletVersion.java
@@ -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
@@ -114,6 +121,8 @@ public final class ServletVersion extends J2EEBaseVersion {
             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;
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 a76c7d8d33..ccb48cfe06 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
@@ -161,7 +161,7 @@ public class Hk2DeploymentFactory implements DeploymentFactory {
         // 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);
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 b9f87f9721..8034e694a4 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
@@ -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. */
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 d062468e61..846321e11a 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
@@ -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                                                       //
     ////////////////////////////////////////////////////////////////////////////
@@ -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>
@@ -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);
     }
 
     ////////////////////////////////////////////////////////////////////////////
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 7ed6f62e95..cbc88e4e70 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
@@ -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
diff --git a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java
index 719d8824f5..b6ad5bccad 100644
--- a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java
+++ b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java
@@ -99,6 +99,8 @@ public class GlassFishVersionTest {
                 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);
     }
 
     /**
@@ -119,7 +121,8 @@ public class GlassFishVersionTest {
             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",
@@ -128,7 +131,7 @@ public class GlassFishVersionTest {
             "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]);
diff --git a/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/ASDDVersion.java b/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/ASDDVersion.java
index 8d9f9a0e68..3bd04150e6 100644
--- a/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/ASDDVersion.java
+++ b/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/ASDDVersion.java
@@ -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


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists