From f56b456c49b082ae09c24d2f612688a50076fe8d Mon Sep 17 00:00:00 2001
From: Gaurav Gupta <gaurav.gupta@payara.fish>
Date: Thu, 7 Oct 2021 11:07:38 +0530
Subject: [PATCH] Fixes creation of a Glassfish deployment descriptor

---
 .../modules/glassfish/eecommon/api/Utils.java | 26 +++----------------
 .../templates/SunDDVisualPanel.java           |  9 ++++---
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/Utils.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/Utils.java
index 89cf11626cd8..6b4953ef82d2 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/Utils.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/Utils.java
@@ -30,6 +30,8 @@
 import org.netbeans.modules.glassfish.eecommon.api.config.J2eeModuleHelper;
 import org.netbeans.modules.j2ee.dd.api.common.RootInterface;
 import org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException;
+import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
+import org.netbeans.modules.j2ee.dd.api.web.WebApp;
 import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
 import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
 import org.openide.filesystems.FileObject;
@@ -177,30 +179,10 @@ public boolean accept(File f) {
     }
     
     public static FileObject getSunDDFromProjectsModuleVersion(J2eeModule mod, String sunDDFileName) {
-        FileObject retVal = null;
-        String suffix = "-java_ee_5/";
-        if (null != mod) {
-            String modVer = mod.getModuleVersion();
-            J2eeModule.Type t = mod.getType();
-            // ejb 2.0, 2.1, 3.0, 3.1
-            // web 2.3, 2.4, 2.5, 3.0
-            // appcli 1.3, 1.4, 5.0, 6.0
-            // ear 1.3, 1.4, 5, 6
-            if (modVer.equals("6") || modVer.equals("6.0") || modVer.endsWith("1.6") || modVer.equals("3.1")) {
-                suffix = "-java_ee/";
-            } else if (modVer.equals("3.0")) {
-                if (J2eeModule.Type.WAR.equals(t)) {
-                    suffix = "-java_ee/";
-                }
-            } else if (modVer.equals("1.4") || modVer.equals("2.4") || modVer.equals("2.1")) {
-                suffix = "-j2ee_1_4/";
-            } else if (modVer.equals("2.0") || modVer.equals("2.3") || modVer.equals("1.3")) {
-                suffix = "-j2ee_1_3/";
-            }
-        }
+        FileObject retVal;
+        String suffix = "-java_ee/";
         String resource = "org-netbeans-modules-glassfish-eecommon-ddtemplates" + suffix + sunDDFileName; // NOI18N
         retVal = FileUtil.getConfigFile(resource);
-        
         return retVal;
     }
     
diff --git a/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/share/configbean/templates/SunDDVisualPanel.java b/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/share/configbean/templates/SunDDVisualPanel.java
index f0344941db90..590f247d50ff 100644
--- a/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/share/configbean/templates/SunDDVisualPanel.java
+++ b/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/share/configbean/templates/SunDDVisualPanel.java
@@ -41,6 +41,7 @@ public final class SunDDVisualPanel extends JPanel {
     private String sunDDFileName;
     private File sunDDFile;
     private File sunDDLocation;
+    private static final String STANDARD_DD_NAME = "web.xml";
 
     public SunDDVisualPanel() {
         initComponents();
@@ -58,10 +59,10 @@ void setProject(final Project project) {
         J2eeModule j2eeModule = provider.getJ2eeModule();
         sunDDFileName = getConfigFileName(j2eeModule,provider.getServerInstanceID());
 
-        // Calculate location:
-        sunDDFile = (sunDDFileName != null) ? j2eeModule.getDeploymentConfigurationFile(sunDDFileName) : null;
-        sunDDLocation = (sunDDFile != null) ? sunDDFile.getParentFile() : null;
-        
+        // Calculate location:        
+        sunDDLocation = j2eeModule.getDeploymentConfigurationFile(STANDARD_DD_NAME).getParentFile();
+        sunDDFile = (sunDDFileName != null) ? new File(sunDDLocation, sunDDFileName) : null;
+
         // initialize visual components
         textFileName.setText(sunDDFileName); // NOI18N
         textProjectName.setText(ProjectUtils.getInformation(project).getDisplayName());