Added EntierpriseEditionVersion enum.

ServletContextHandler now sets ENVIRONMENT using above enum.

Author: rickardoberg

jetty-ee/jetty-ee-common/src/main/java/org/eclipse/jetty/ee/common/EnterpriseEditionVersion.java

@@ -0,0 +1,56 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+package org.eclipse.jetty.ee.common;
+
+public enum EnterpriseEditionVersion
+{
+    ee10(10),
+    ee11(11);
+
+    public static final EnterpriseEditionVersion currentVersion = initEnterpriseEditionVersion();
+
+    public static EnterpriseEditionVersion getEnterpriseEditionVersion()
+    {
+        return currentVersion;
+    }
+
+    private final int version;
+
+    EnterpriseEditionVersion(int version)
+    {
+        this.version = version;
+    }
+
+    public int version()
+    {
+        return version;
+    }
+
+    private static EnterpriseEditionVersion initEnterpriseEditionVersion()
+    {
+        try
+        {
+            return switch (ServletApiVersion.getServletApiVersion())
+            {
+                case v6_0 -> ee10;
+                case v6_1 -> ee11;
+                default -> null;
+            };
+        }
+        catch (Throwable e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+}

jetty-ee/jetty-ee-common/src/main/java/org/eclipse/jetty/ee/common/ServletApiVersion.java

@@ -27,9 +27,8 @@ public enum ServletApiVersion
     v6_0("6.0"),
     v6_1("6.1");
 
-    public static ServletApiVersion currentVersion = initServletApiVersion();
+    public static final ServletApiVersion currentVersion = initServletApiVersion();
 
-    private static Logger LOG = LoggerFactory.getLogger(ServletApiVersion.class);
     private final String version;
     private final int major;
     private final int minor;
@@ -85,7 +84,7 @@ public static ServletApiVersion initServletApiVersion()
             }
             return ServletApiVersion.from(specificationVersion);
         }
-        catch (ClassNotFoundException e)
+        catch (ClassNotFoundException | NoClassDefFoundError e)
         {
             throw new IllegalStateException("Cannot detect servlet API version", e);
         }

jetty-ee/jetty-ee-common/src/main/java/org/eclipse/jetty/ee/common/WebsocketApiVersion.java

@@ -26,7 +26,7 @@ public enum WebsocketApiVersion
     v2_1("2.1"),
     v2_2("2.2");
 
-    public static WebsocketApiVersion currentVersion = initWebsocketApiVersion();
+    public static final WebsocketApiVersion currentVersion = initWebsocketApiVersion();
 
     private static Logger LOG = LoggerFactory.getLogger(WebsocketApiVersion.class);
     private final String version;
@@ -84,7 +84,7 @@ public static WebsocketApiVersion initWebsocketApiVersion()
             }
             return WebsocketApiVersion.from(specificationVersion);
         }
-        catch (ClassNotFoundException e)
+        catch (ClassNotFoundException | NoClassDefFoundError e)
         {
             throw new IllegalStateException("Cannot detect websocket API version", e);
         }

jetty-ee/jetty-ee-osgi/jetty-ee-osgi-boot/src/main/java/org/eclipse/jetty/ee/osgi/boot/EEActivator.java

@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.jetty.ee.common.EnterpriseEditionVersion;
 import org.eclipse.jetty.ee.common.ServletApiVersion;
 import org.eclipse.jetty.ee.common.WebAppClassLoader;
 import org.eclipse.jetty.ee.webapp.Configuration;
@@ -55,11 +56,7 @@ public class EEActivator extends AbstractEEActivator
 {
     private static final Logger LOG = LoggerFactory.getLogger(EEActivator.class);
 
-    public static final String ENVIRONMENT = switch (ServletApiVersion.getServletApiVersion()){
-        case v6_0 -> "ee10";
-        case v6_1 -> "ee11";
-        default -> null;
-    };
+    public static final String ENVIRONMENT = EnterpriseEditionVersion.getEnterpriseEditionVersion().name();
 
     @Override
     public String getEnvironment()

jetty-ee/jetty-ee-servlet/src/main/java/module-info.java

@@ -33,6 +33,7 @@
     requires static java.security.jgss;
     // Only required if using JDBCLoginService.
     requires static java.sql;
+    requires org.eclipse.jetty.ee.common;
 
     exports org.eclipse.jetty.ee.servlet;
     exports org.eclipse.jetty.ee.servlet.listener;

jetty-ee/jetty-ee-servlet/src/main/java/org/eclipse/jetty/ee/servlet/ServletContextHandler.java

@@ -68,6 +68,7 @@
 import jakarta.servlet.http.HttpSessionBindingListener;
 import jakarta.servlet.http.HttpSessionIdListener;
 import jakarta.servlet.http.HttpSessionListener;
+import org.eclipse.jetty.ee.common.EnterpriseEditionVersion;
 import org.eclipse.jetty.ee.servlet.ServletContextResponse.EncodingFrom;
 import org.eclipse.jetty.ee.servlet.ServletContextResponse.OutputType;
 import org.eclipse.jetty.ee.servlet.security.ConstraintAware;
@@ -132,7 +133,7 @@
 public class ServletContextHandler extends ContextHandler
 {
     private static final Logger LOG = LoggerFactory.getLogger(ServletContextHandler.class);
-    public static final Environment ENVIRONMENT = Environment.ensure("ee", ServletContextHandler.class);
+    public static final Environment ENVIRONMENT = Environment.ensure(EnterpriseEditionVersion.getEnterpriseEditionVersion().name(), ServletContextHandler.class);
     /**
      * @deprecated Use {@link ServletContextHandler#ENVIRONMENT} instead.
      */

jetty-ee/jetty-ee-webapp/src/main/java/org/eclipse/jetty/ee/webapp/WebDescriptor.java

@@ -97,7 +97,7 @@ public static XmlParser newParser(boolean validating)
 
     protected static void addDescriptorCatalog(XmlParser xmlParser) throws IllegalStateException
     {
-        String catalogName = "catalog-%s.xml".formatted(ServletContextHandler.ENVIRONMENT.getName());
+        String catalogName = "catalog-ee.xml";
         URL url = WebDescriptor.class.getResource(catalogName);
         if (url == null)
             throw new IllegalStateException("Catalog not found: %s/%s".formatted(WebDescriptor.class.getPackageName(), catalogName));