Fix #22125: Remove the archive suffix before storing module name (#22126)

Author: mskdeepak-oracle

appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ResourceValidator.java

@@ -904,11 +904,12 @@ private void storeAppScopedResources(Map<String, List<String>> resources, String
             appNamespace.addAll(appLevelResources);
             for (Map.Entry<String, List<String>> entry: resources.entrySet()) {
                 if (!entry.getKey().equals(appName)) {
-                    List<String> jndiNames = moduleNamespaces.get(entry.getKey());
+                    String moduleName = getActualModuleName(entry.getKey());
+                    List<String> jndiNames = moduleNamespaces.get(moduleName);
                     if (jndiNames == null) {
                         jndiNames = new ArrayList<>();
                         jndiNames.addAll(entry.getValue());
-                        moduleNamespaces.put(entry.getKey(), jndiNames);
+                        moduleNamespaces.put(moduleName, jndiNames);
                     }
                     else {
                         jndiNames.addAll(entry.getValue());
@@ -934,7 +935,7 @@ public void store(String jndiName, JndiNameEnvironment env) {
                 }
             }
             else if (jndiName.startsWith(ResourceConstants.JAVA_MODULE_SCOPE_PREFIX)) {
-                String moduleName = DOLUtils.getModuleName(env);
+                String moduleName = getActualModuleName(DOLUtils.getModuleName(env));
                 List<String> jndiNames = moduleNamespaces.get(moduleName);
                 if (jndiNames == null) {
                     jndiNames = new ArrayList<>();
@@ -970,7 +971,7 @@ public boolean find(String jndiName, JndiNameEnvironment env) {
                 return jndiNames != null && jndiNames.contains(jndiName);
             }
             else if (jndiName.startsWith(ResourceConstants.JAVA_MODULE_SCOPE_PREFIX)) {
-                String moduleName = DOLUtils.getModuleName(env);
+                String moduleName = getActualModuleName(DOLUtils.getModuleName(env));
                 List jndiNames = moduleNamespaces.get(moduleName);
                 return jndiNames != null && jndiNames.contains(jndiName);
             }
@@ -981,6 +982,18 @@ else if (jndiName.startsWith(ResourceConstants.JAVA_GLOBAL_SCOPE_PREFIX))
             else
                 return nonPortableJndiNames.contains(jndiName);
         }
+
+        /**
+         * Remove suffix from the module name.
+         */
+        private String getActualModuleName(String moduleName) {
+            if(moduleName != null){
+                if(moduleName.endsWith(".jar") || moduleName.endsWith(".war") || moduleName.endsWith(".rar")){
+                    moduleName = moduleName.substring(0, moduleName.length()-4);
+                }
+            }
+            return moduleName;
+        }
     }
 
     /**