#53 remove servlet test support

cms-api/pom.xml

@@ -28,11 +28,6 @@
 			<artifactId>jetty-http</artifactId>
 			<version>${jetty.version}</version>
 		</dependency>
-		 <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-			<version>6.0.0</version>
-        </dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j2-impl</artifactId>

cms-api/src/main/java/com/github/thmarx/cms/api/extensions/JettyHttpHandlerExtensionPoint.java

@@ -28,6 +28,6 @@ public abstract class JettyHttpHandlerExtensionPoint extends AbstractExtensionPo
 
 	abstract public String getContextPath();
 
-	abstract public Mapping getHandler();
+	abstract public Mapping getMapping();
 
 }

cms-server/pom.xml

@@ -39,11 +39,6 @@
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-server</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty.ee10</groupId>
-			<artifactId>jetty-ee10-servlet</artifactId>
-			<version>12.0.3</version>
-		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>

cms-server/src/main/java/com/github/thmarx/cms/server/jetty/JettyVHost.java

@@ -20,19 +20,14 @@
  * #L%
  */
 import com.github.thmarx.cms.api.ServerProperties;
-import com.github.thmarx.cms.api.extensions.JettyHttpHandlerExtensionPoint;
-import com.github.thmarx.cms.api.extensions.ServletExtensionPoint;
 import com.github.thmarx.cms.server.jetty.handler.JettyDefaultHandler;
 import com.github.thmarx.cms.server.jetty.handler.JettyExtensionHandler;
 import com.github.thmarx.cms.server.VHost;
 import com.github.thmarx.cms.server.jetty.handler.JettyModuleMappingHandler;
-import com.github.thmarx.cms.server.jetty.handler.JettyServletModuleMappingHandler;
-import jakarta.servlet.http.HttpServlet;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.http.pathmap.PathSpec;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.handler.ContextHandler;
@@ -88,8 +83,7 @@ public Handler httpHandler() {
 		ContextHandlerCollection contextCollection = new ContextHandlerCollection(
 				defaultContextHandler,
 				moduleContextHandler,
-				extensionContextHandler,
-				servletContexteHandler()
+				extensionContextHandler
 		);
 
 		GzipHandler gzipHandler = new GzipHandler(contextCollection);
@@ -101,25 +95,4 @@ public Handler httpHandler() {
 
 		return gzipHandler;
 	}
-
-	private ServletContextHandler servletContexteHandler() {
-		ServletContextHandler contextHandler = new ServletContextHandler("/servlet-modules");
-		//contextHandler.addServlet(new JettyServletModuleMappingHandler(moduleManager, siteProperties), "/*");
-
-		siteProperties.activeModules().forEach((var moduleid) -> {
-			final com.github.thmarx.modules.api.Module module = moduleManager
-					.module(moduleid);
-			if (module.provides(ServletExtensionPoint.class)) {
-				List<ServletExtensionPoint> extensions = module.extensions(ServletExtensionPoint.class);
-				extensions.forEach(ext -> {
-					ext.getMapping().getServletMappings().forEach((path, servlet) -> {
-						contextHandler.addServlet(servlet, "/%s%s".formatted(moduleid, path));
-					});
-
-				});
-			}
-		});
-
-		return contextHandler;
-	}
 }

cms-server/src/main/java/com/github/thmarx/cms/server/jetty/handler/JettyModuleMappingHandler.java

@@ -54,7 +54,7 @@ public void init () {
 					.module(moduleid);
 			if (module.provides(JettyHttpHandlerExtensionPoint.class)) {
 				List<JettyHttpHandlerExtensionPoint> extensions = module.extensions(JettyHttpHandlerExtensionPoint.class);
-				extensions.forEach(ext -> moduleMappgings.put(moduleid, ext.getHandler()));
+				extensions.forEach(ext -> moduleMappgings.put(moduleid, ext.getMapping()));
 			}
 		});
 	}

modules/example-module/src/main/java/com/github/thmarx/cms/modules/example/ExampleJettyHttpHandlerExtension.java

@@ -45,7 +45,7 @@ public String getContextPath() {
 	}
 
 	@Override
-	public Mapping getHandler() {
+	public Mapping getMapping() {
 		Mapping mapping = new Mapping();
 		mapping.add(PathSpec.from("/world"), new ExampleHandler("Hello world!"));
 		mapping.add(PathSpec.from("/people"), new ExampleHandler("Hello people!"));