- removed deprecated EL method override

- fallback to a default ContextService in ManagedScheduledExecutorServiceImpl
- removed unused var in CUTask
- removed not-existing jetty dependency

Author: tandraschko

container/openejb-core/src/main/java/org/apache/openejb/cdi/WebAppElResolver.java

@@ -22,8 +22,6 @@
 import jakarta.el.ELResolver;
 import jakarta.el.PropertyNotFoundException;
 import jakarta.el.PropertyNotWritableException;
-import java.beans.FeatureDescriptor;
-import java.util.Iterator;
 
 public class WebAppElResolver extends ELResolver {
     private final ELResolver parent;
@@ -63,12 +61,7 @@ public boolean isReadOnly(final ELContext context, final Object base, final Obje
     }
 
     @Override
-    public Iterator<FeatureDescriptor> getFeatureDescriptors(final ELContext context, final Object base) {
-        return null;
-    }
-
-    @Override
-    public Class<?> getCommonPropertyType(final ELContext context, final Object base) {
+    public Class<?> getCommonPropertyType(ELContext context, Object base) {
         return null;
     }
 }

container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedScheduledExecutorServiceImplFactory.java

@@ -43,25 +43,38 @@ public ManagedScheduledExecutorServiceImpl create(final ContextServiceImpl conte
         return new ManagedScheduledExecutorServiceImpl(createScheduledExecutorService(), contextService);
     }
     public ManagedScheduledExecutorServiceImpl create() {
-        return new ManagedScheduledExecutorServiceImpl(createScheduledExecutorService(), findContextService());
-    }
+        String context;
+        if (this.context == null || this.context.isBlank()) {
+            context = "java:comp/DefaultContextService";
+        }
+        else {
+            context = "openejb/Resource/" + this.context;
+        }
 
-    private ContextServiceImpl findContextService() {
-        if (context == null || context.trim().isEmpty()) {
-            throw new IllegalArgumentException("Please specify a context service to be used with the managed executor");
+        ContextServiceImpl contextService = findContextService(context);
+        if (contextService == null) {
+            contextService = ContextServiceImplFactory.newPropagateEverythingContextService();
         }
 
+        return new ManagedScheduledExecutorServiceImpl(createScheduledExecutorService(), contextService);
+    }
+
+    private ContextServiceImpl findContextService(String contextName) {
         try {
             final ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
+            // happens at least in unittests
+            if (containerSystem == null) {
+                return null;
+            }
             final Context context = containerSystem.getJNDIContext();
-            final Object obj = context.lookup("openejb/Resource/" + this.context);
+            final Object obj = context.lookup(contextName);
             if (!(obj instanceof ContextServiceImpl)) {
                 throw new IllegalArgumentException("Resource with id " + context
                         + " is not a ContextService, but is " + obj.getClass().getName());
             }
             return (ContextServiceImpl) obj;
         } catch (final NamingException e) {
-            throw new IllegalArgumentException("Unknown context service " + context);
+            throw new IllegalArgumentException("Unknown context service " + contextName);
         }
     }
 

container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUTask.java

@@ -28,7 +28,6 @@
 import java.util.concurrent.Callable;
 
 public abstract class CUTask<T> extends ManagedTaskListenerTask implements Comparable<Object> {
-    private static final SecurityService SECURITY_SERVICE = SystemInstance.get().getComponent(SecurityService.class);
 
     // only updated in container startup phase, no concurrency possible, don't use it at runtime!
     private static volatile ContainerListener[] CONTAINER_LISTENERS = new ContainerListener[0];

pom.xml

@@ -1140,11 +1140,6 @@
         <artifactId>jetty-server</artifactId>
         <version>${version.jetty}</version>
       </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-continuation</artifactId>
-        <version>${version.jetty}</version>
-      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-jsp-2.1</artifactId>