SAK-41756 Kernel SakaiContextLoader support for servlet 3.0+ (sakaipr…

…oject#6881)

kernel/component-manager/src/main/java/org/sakaiproject/component/impl/SakaiContextLoader.java

@@ -35,18 +35,29 @@
 import org.springframework.web.context.ConfigurableWebApplicationContext;
 import org.springframework.web.context.ContextLoader;
 
+import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.context.WebApplicationContext;
 
 /**
  * <p>
- * Sakai's extension to Spring's ContextLoader - adds the location of the ComponentManager shared AC, linking the local AC to it as parent, and loading localy hosted components into shared.
+ * Sakai's extension to Spring's {@link ContextLoader} - adds the location of the ComponentManager shared AC,
+ * linking the local AC to it as parent, and loading localy hosted components into shared.
  * </p>
  */
+@NoArgsConstructor
 @Slf4j
 public class SakaiContextLoader extends ContextLoader
 {
 	public static final String SPRING_CONTEXT_SUFFIX = "-context.xml";
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public SakaiContextLoader(WebApplicationContext context) {
+		super(context);
+	}
+
 	/**
 	 * Allows loading/override of custom bean definitions from sakai.home
 	 *

kernel/component-manager/src/main/java/org/sakaiproject/util/SakaiContextLoaderListener.java

@@ -26,20 +26,27 @@
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
+import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.sakaiproject.component.cover.ComponentManager;
 import org.sakaiproject.component.impl.SakaiContextLoader;
 import org.sakaiproject.component.impl.SpringCompMgr;
 import org.springframework.beans.factory.DisposableBean;
+import org.springframework.web.context.WebApplicationContext;
 
 /**
  * <p>
  * Sakai's extension to the Spring ContextLoaderListener - use our ContextLoader, and increment / decrement the child count of the ComponentManager on init / destroy.
  * </p>
  */
+@NoArgsConstructor
 @Slf4j
 public class SakaiContextLoaderListener extends SakaiContextLoader implements ServletContextListener
 {
+	public SakaiContextLoaderListener(WebApplicationContext context) {
+		super(context);
+	}
+
 	/**
 	 * Initialize the root web application context.
 	 */