Scattered WAR support fixed

- fixes two tests in ejb_group_embedded (Jenkins failure in this branch) - one test remaining Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
eclipse-ee4j · Sep 18, 2022 · 80420f2 · 80420f2
1 parent 2d5172b
commit 80420f2
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 27 deletions.
diff --git a/...nt/dol/src/main/java/com/sun/enterprise/deployment/archivist/ACCPersistenceArchivist.java b/...nt/dol/src/main/java/com/sun/enterprise/deployment/archivist/ACCPersistenceArchivist.java
@@ -57,7 +57,7 @@ public class ACCPersistenceArchivist extends PersistenceArchivist {
 
     @Override
     public boolean supportsModuleType(ArchiveType moduleType) {
-        return (moduleType != null && moduleType.equals(DOLUtils.carType())) && (env.getProcessType() == ProcessType.ACC) ;
+        return DOLUtils.carType().equals(moduleType) && env.getProcessType() == ProcessType.ACC ;
     }
 
 

diff --git a/...nt/dol/src/main/java/com/sun/enterprise/deployment/archivist/EarPersistenceArchivist.java b/...nt/dol/src/main/java/com/sun/enterprise/deployment/archivist/EarPersistenceArchivist.java
@@ -38,7 +38,7 @@ public class EarPersistenceArchivist extends PersistenceArchivist {
 
     @Override
     public boolean supportsModuleType(ArchiveType moduleType) {
-        return moduleType!=null && moduleType.equals(DOLUtils.earType());
+        return DOLUtils.earType().equals(moduleType);
     }
 
 

diff --git a/...src/main/java/com/sun/enterprise/deployment/archivist/ServerSidePersistenceArchivist.java b/...src/main/java/com/sun/enterprise/deployment/archivist/ServerSidePersistenceArchivist.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -16,12 +17,14 @@
 
 package com.sun.enterprise.deployment.archivist;
 
+import com.sun.enterprise.deployment.util.DOLUtils;
+
+import jakarta.inject.Inject;
+
+import org.glassfish.api.admin.ProcessEnvironment;
 import org.glassfish.api.deployment.archive.ArchiveType;
 import org.glassfish.api.deployment.archive.ReadableArchive;
-import org.glassfish.api.admin.*;
 import org.jvnet.hk2.annotations.Service;
-import com.sun.enterprise.deployment.util.DOLUtils;
-import jakarta.inject.Inject;
 
 
 /**
@@ -36,9 +39,9 @@ public class ServerSidePersistenceArchivist extends PersistenceArchivist {
     @Override
     public boolean supportsModuleType(ArchiveType moduleType) {
         // Reads persitence.xml for ejb jars
-        return moduleType != null && (moduleType.equals(DOLUtils.ejbType()) ||
-                // Or App client modules if running inside server
-                (moduleType.equals(DOLUtils.carType()) && env.getProcessType().isServer()));
+        // Or App client modules if running inside server
+        return DOLUtils.ejbType().equals(moduleType)
+            || (DOLUtils.carType().equals(moduleType) && env.getProcessType().isServer());
     }
 
     @Override

diff --git a/...nt/dol/src/main/java/com/sun/enterprise/deployment/archivist/WarPersistenceArchivist.java b/...nt/dol/src/main/java/com/sun/enterprise/deployment/archivist/WarPersistenceArchivist.java
@@ -18,7 +18,6 @@
 package com.sun.enterprise.deployment.archivist;
 
 import com.sun.enterprise.deployment.io.DescriptorConstants;
-import com.sun.enterprise.deployment.util.DOLUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -33,15 +32,19 @@
 import org.jvnet.hk2.annotations.Service;
 import org.xml.sax.SAXException;
 
+import static com.sun.enterprise.deployment.util.DOLUtils.scatteredWarType;
+import static com.sun.enterprise.deployment.util.DOLUtils.warType;
+
 @Service
 @ExtensionsArchivistFor("jpa")
 public class WarPersistenceArchivist extends PersistenceArchivist {
 
     @Override
     public boolean supportsModuleType(ArchiveType moduleType) {
-        return moduleType != null && moduleType.equals(DOLUtils.warType());
+        return warType().equals(moduleType) || scatteredWarType().equals(moduleType);
     }
 
+
     @Override
     public RootDeploymentDescriptor open(Archivist main, ReadableArchive warArchive, RootDeploymentDescriptor descriptor) throws IOException, SAXException {
         final String CLASSES_DIR = "WEB-INF/classes/";

diff --git a/...java/com/sun/enterprise/deployment/io/runtime/WLSWebServicesDeploymentDescriptorFile.java b/...java/com/sun/enterprise/deployment/io/runtime/WLSWebServicesDeploymentDescriptorFile.java
@@ -25,7 +25,6 @@
 import com.sun.enterprise.deployment.node.RootXMLNode;
 import com.sun.enterprise.deployment.node.ws.WLDescriptorConstants;
 import com.sun.enterprise.deployment.node.ws.WLWebServicesDescriptorNode;
-import com.sun.enterprise.deployment.util.DOLUtils;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -34,6 +33,9 @@
 import org.glassfish.deployment.common.Descriptor;
 import org.glassfish.deployment.common.RootDeploymentDescriptor;
 
+import static com.sun.enterprise.deployment.util.DOLUtils.scatteredWarType;
+import static com.sun.enterprise.deployment.util.DOLUtils.warType;
+
 /**
  * This class is responsible for handling the WebLogic webservices deployment descriptor.
  * This file weblogic-webservices.xml complements JSR-109 defined webservices.xml
@@ -47,8 +49,9 @@ public class WLSWebServicesDeploymentDescriptorFile extends ConfigurationDeploym
 
     public WLSWebServicesDeploymentDescriptorFile(RootDeploymentDescriptor desc) {
         if (desc instanceof WebServicesDescriptor) {
-            descriptorPath = (((WebServicesDescriptor) desc).getBundleDescriptor().getModuleType()
-                .equals(DOLUtils.warType()))
+            BundleDescriptor descriptor = ((WebServicesDescriptor) desc).getBundleDescriptor();
+            descriptorPath = warType().equals(descriptor.getModuleType())
+                || scatteredWarType().equals(descriptor.getModuleType())
                     ? WLDescriptorConstants.WL_WEB_WEBSERVICES_JAR_ENTRY
                     : WLDescriptorConstants.WL_EJB_WEBSERVICES_JAR_ENTRY;
         } else if (desc instanceof WebBundleDescriptor) {
@@ -63,7 +66,7 @@ public String getDeploymentDescriptorPath() {
         return descriptorPath;
     }
 
-    public static Vector getAllDescriptorPaths() {
+    public static Vector<String> getAllDescriptorPaths() {
         Vector<String> allDescPaths = new Vector<>();
         allDescPaths.add(WLDescriptorConstants.WL_WEB_WEBSERVICES_JAR_ENTRY);
         allDescPaths.add(WLDescriptorConstants.WL_EJB_WEBSERVICES_JAR_ENTRY);

diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/DOLUtils.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/DOLUtils.java
@@ -26,6 +26,7 @@
 import com.sun.enterprise.deployment.EjbDescriptor;
 import com.sun.enterprise.deployment.JndiNameEnvironment;
 import com.sun.enterprise.deployment.ManagedBeanDescriptor;
+import com.sun.enterprise.deployment.ScatteredWarType;
 import com.sun.enterprise.deployment.WebBundleDescriptor;
 import com.sun.enterprise.deployment.archivist.Archivist;
 import com.sun.enterprise.deployment.archivist.ArchivistFactory;
@@ -303,6 +304,10 @@ public static ArchiveType rarType() {
         return getModuleType("rar");
     }
 
+    public static ArchiveType scatteredWarType() {
+        return getModuleType(ScatteredWarType.ARCHIVE_TYPE);
+    }
+
     /**
      * Utility method to retrieve a {@link ArchiveType} from a stringified module type.
      * Since {@link ArchiveType} is an extensible abstraction and implementations are plugged in via HK2 service
@@ -710,7 +715,7 @@ public static boolean setElementValue(XMLElement element, String value, Object o
         return false;
     }
 
-    /*
+    /**
      * Returns a list of the proprietary schema namespaces
      */
     public static List<String> getProprietarySchemaNamespaces() {
@@ -720,7 +725,7 @@ public static List<String> getProprietarySchemaNamespaces() {
         return ns;
     }
 
-    /*
+    /**
      * Returns a list of the proprietary dtd system IDs
      */
     public static List<String> getProprietaryDTDStart() {

diff --git a/...ejb-container/src/main/java/org/glassfish/ejb/deployment/archivist/EjbInWarArchivist.java b/...ejb-container/src/main/java/org/glassfish/ejb/deployment/archivist/EjbInWarArchivist.java
@@ -45,6 +45,9 @@
 import org.glassfish.hk2.api.ServiceLocator;
 import org.jvnet.hk2.annotations.Service;
 
+import static com.sun.enterprise.deployment.util.DOLUtils.scatteredWarType;
+import static com.sun.enterprise.deployment.util.DOLUtils.warType;
+
 /**
  * @author Mahesh Kannan
  */
@@ -97,7 +100,7 @@ public ModuleScanner getScanner() {
 
     @Override
     public boolean supportsModuleType(ArchiveType moduleType) {
-        return moduleType != null && moduleType.equals(DOLUtils.warType());
+        return warType().equals(moduleType) || scatteredWarType().equals(moduleType);
     }
 
     @Override

diff --git a/...-container/src/main/java/org/glassfish/ejb/deployment/io/EjbDeploymentDescriptorFile.java b/...-container/src/main/java/org/glassfish/ejb/deployment/io/EjbDeploymentDescriptorFile.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -25,6 +26,8 @@
 import org.glassfish.ejb.deployment.descriptor.EjbBundleDescriptorImpl;
 import org.glassfish.ejb.deployment.node.EjbBundleNode;
 
+import static com.sun.enterprise.deployment.util.DOLUtils.warType;
+
 /**
  * This class is responsible for handling EJB DeploymentDescriptor files
  *
@@ -37,9 +40,11 @@ public class EjbDeploymentDescriptorFile extends DeploymentDescriptorFile {
      * @return the location of the DeploymentDescriptor file for a
      * particular type of J2EE Archive
      */
+    @Override
     public String getDeploymentDescriptorPath() {
-        return DOLUtils.warType().equals(getArchiveType()) ?
-                DescriptorConstants.EJB_IN_WAR_ENTRY : DescriptorConstants.EJB_JAR_ENTRY;
+        return warType().equals(getArchiveType()) || DOLUtils.scatteredWarType().equals(getArchiveType())
+            ? DescriptorConstants.EJB_IN_WAR_ENTRY
+            : DescriptorConstants.EJB_JAR_ENTRY;
     }
 
     /**

diff --git a/...ver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/io/EjbRuntimeDDFile.java b/...ver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/io/EjbRuntimeDDFile.java
@@ -21,15 +21,15 @@
 import com.sun.enterprise.deployment.io.ConfigurationDeploymentDescriptorFileFor;
 import com.sun.enterprise.deployment.io.DescriptorConstants;
 import com.sun.enterprise.deployment.node.RootXMLNode;
-import com.sun.enterprise.deployment.util.DOLUtils;
 
 import org.glassfish.deployment.common.Descriptor;
 import org.glassfish.ejb.deployment.descriptor.EjbBundleDescriptorImpl;
 import org.glassfish.ejb.deployment.node.runtime.EjbBundleRuntimeNode;
 import org.glassfish.hk2.api.PerLookup;
-
 import org.jvnet.hk2.annotations.Service;
 
+import static com.sun.enterprise.deployment.util.DOLUtils.scatteredWarType;
+import static com.sun.enterprise.deployment.util.DOLUtils.warType;
 
 /**
  * This class is responsible for handling the XML configuration information
@@ -46,9 +46,11 @@ public class EjbRuntimeDDFile extends ConfigurationDeploymentDescriptorFile {
      * @return the location of the DeploymentDescriptor file for a
      *         particular type of J2EE Archive
      */
+    @Override
     public String getDeploymentDescriptorPath() {
-        return DOLUtils.warType().equals(getArchiveType()) ?
-                DescriptorConstants.S1AS_EJB_IN_WAR_ENTRY : DescriptorConstants.S1AS_EJB_JAR_ENTRY;
+        return warType().equals(getArchiveType()) || scatteredWarType().equals(getArchiveType())
+            ? DescriptorConstants.S1AS_EJB_IN_WAR_ENTRY
+            : DescriptorConstants.S1AS_EJB_JAR_ENTRY;
     }
 
     /**

diff --git a/...r/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/io/GFEjbRuntimeDDFile.java b/...r/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/io/GFEjbRuntimeDDFile.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -23,12 +24,13 @@
 
 import org.jvnet.hk2.annotations.Service;
 
+import static com.sun.enterprise.deployment.util.DOLUtils.scatteredWarType;
+import static com.sun.enterprise.deployment.util.DOLUtils.warType;
 import com.sun.ejb.containers.EjbContainerUtil;
 import com.sun.enterprise.deployment.io.ConfigurationDeploymentDescriptorFile;
 import com.sun.enterprise.deployment.io.ConfigurationDeploymentDescriptorFileFor;
 import com.sun.enterprise.deployment.io.DescriptorConstants;
 import com.sun.enterprise.deployment.node.RootXMLNode;
-import com.sun.enterprise.deployment.util.DOLUtils;
 
 /**
  * This class is responsible for handling the XML configuration information
@@ -42,9 +44,11 @@ public class GFEjbRuntimeDDFile extends ConfigurationDeploymentDescriptorFile {
      * @return the location of the DeploymentDescriptor file for a
      *         particular type of J2EE Archive
      */
+    @Override
     public String getDeploymentDescriptorPath() {
-        return DOLUtils.warType().equals(getArchiveType()) ?
-                DescriptorConstants.GF_EJB_IN_WAR_ENTRY : DescriptorConstants.GF_EJB_JAR_ENTRY;
+        return warType().equals(getArchiveType()) || scatteredWarType().equals(getArchiveType())
+            ? DescriptorConstants.GF_EJB_IN_WAR_ENTRY
+            : DescriptorConstants.GF_EJB_JAR_ENTRY;
     }
 
     /**

diff --git a/...ces/connector/src/main/java/org/glassfish/webservices/archivist/WebServicesArchivist.java b/...ces/connector/src/main/java/org/glassfish/webservices/archivist/WebServicesArchivist.java
@@ -72,7 +72,8 @@ public List<ConfigurationDeploymentDescriptorFile> getConfigurationDDFiles(RootD
 
     @Override
     public boolean supportsModuleType(ArchiveType moduleType) {
-        return (DOLUtils.warType().equals(moduleType) || DOLUtils.ejbType().equals(moduleType));
+        return DOLUtils.warType().equals(moduleType) || DOLUtils.ejbType().equals(moduleType)
+            || DOLUtils.scatteredWarType().equals(moduleType);
     }
 
     @Override