diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/invoker.properties b/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/invoker.properties deleted file mode 100644 index e0222d4d54e..00000000000 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/invoker.properties +++ /dev/null @@ -1 +0,0 @@ -invoker.goals = test \ No newline at end of file diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/pom.xml deleted file mode 100644 index 2b8d3949624..00000000000 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/pom.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - 4.0.0 - - - org.eclipse.jetty.its - it-parent-pom - 0.0.1-SNAPSHOT - - - jetty-run-mojo-jsp - war - - Jetty :: Simple :: Webapp - - - ${project.build.directory}/jetty-run-mojo-jsp.txt - - - - - org.slf4j - slf4j-simple - - - - org.eclipse.jetty - jetty-servlet - provided - - - - org.eclipse.jetty - jetty-maven-plugin - tests - test-jar - test - - - - org.junit.jupiter - junit-jupiter-engine - test - - - - - - - - - - org.apache.maven.plugins - maven-war-plugin - - false - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${jetty.port.file} - Counter accessed 1 times. - /jsp/bean1.jsp - ${project.groupId}:${project.artifactId} - - - org.eclipse.jetty:jetty-maven-plugin - - - - - org.eclipse.jetty - jetty-maven-plugin - - - start-jetty - test-compile - - start - - - - - jetty.port.file - ${jetty.port.file} - - - true - ${basedir}/src/config/jetty.xml - - - - - - - - diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/postbuild.groovy b/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/postbuild.groovy deleted file mode 100644 index d70b253e946..00000000000 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/postbuild.groovy +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -File buildLog = new File( basedir, 'build.log' ) -assert buildLog.text.contains( 'Started Server' ) -assert buildLog.text.contains( 'Running org.eclipse.jetty.maven.plugin.it.TestGetContent') -assert buildLog.text.contains( 'contentCheck') diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/src/config/jetty.xml deleted file mode 100644 index ced70a66d09..00000000000 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/src/config/jetty.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - https - - 32768 - 8192 - 8192 - 4096 - - - - - - - - - - - - - - - - - - - - - - - - - 30000 - - - - diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/src/main/webapp/WEB-INF/web.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 5a6d2867874..00000000000 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - Jetty Simple Webapp run-mojo-jsp - diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/src/main/java/com/acme/Counter.java b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_start_forked/Counter.java similarity index 95% rename from jetty-maven-plugin/src/it/jetty-run-mojo-jsp/src/main/java/com/acme/Counter.java rename to jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_start_forked/Counter.java index 4ff284e5dbe..427a7065bfd 100644 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/src/main/java/com/acme/Counter.java +++ b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_start_forked/Counter.java @@ -16,7 +16,7 @@ // ======================================================================== // -package com.acme; +package org.eclipse.jetty.its.jetty_start_forked; @SuppressWarnings("serial") public class Counter implements java.io.Serializable diff --git a/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_forked_mojo_it/HelloServlet.java b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_start_forked/HelloServlet.java similarity index 96% rename from jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_forked_mojo_it/HelloServlet.java rename to jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_start_forked/HelloServlet.java index 267d52bafaa..c0c2d7725ce 100644 --- a/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_forked_mojo_it/HelloServlet.java +++ b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_start_forked/HelloServlet.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.its.jetty_run_forked_mojo_it; +package org.eclipse.jetty.its.jetty_start_forked; import java.io.IOException; import javax.servlet.ServletException; diff --git a/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_forked_mojo_it/PingServlet.java b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_start_forked/PingServlet.java similarity index 95% rename from jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_forked_mojo_it/PingServlet.java rename to jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_start_forked/PingServlet.java index 386bbe55295..76221db6389 100644 --- a/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_forked_mojo_it/PingServlet.java +++ b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_start_forked/PingServlet.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.its.jetty_run_forked_mojo_it; +package org.eclipse.jetty.its.jetty_start_forked; import java.io.IOException; import javax.servlet.ServletException; diff --git a/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml index a6f28b51a37..028bdc91255 100644 --- a/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml +++ b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml @@ -14,7 +14,7 @@ Ping - org.eclipse.jetty.its.jetty_run_forked_mojo_it.PingServlet + org.eclipse.jetty.its.jetty_start_forked.PingServlet extra1123 @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/pom.xml index a765c2b014c..122e288132f 100644 --- a/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/pom.xml @@ -70,6 +70,8 @@ ${jetty.port.file} true true + Counter accessed 1 times. + /jsp/bean1.jsp ${project.groupId}:${project.artifactId} diff --git a/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/main/webapp/WEB-INF/web.xml b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/main/webapp/WEB-INF/web.xml index 2a5ac4b71bf..b2264670c78 100644 --- a/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/main/webapp/WEB-INF/web.xml +++ b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/main/webapp/WEB-INF/web.xml @@ -3,5 +3,5 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1"> - Jetty Simple Webapp run-mojo-it + Jetty Simple Webapp start-jetty-forked diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/src/main/webapp/jsp/bean1.jsp b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/main/webapp/jsp/bean1.jsp similarity index 67% rename from jetty-maven-plugin/src/it/jetty-run-mojo-jsp/src/main/webapp/jsp/bean1.jsp rename to jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/main/webapp/jsp/bean1.jsp index 02a13d85e56..08dd1ce9280 100644 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-jsp/src/main/webapp/jsp/bean1.jsp +++ b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/main/webapp/jsp/bean1.jsp @@ -1,7 +1,7 @@ <%@ page session="true"%> - +

JSP1.2 Beans: 1