diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/invoker.properties b/jetty-maven-plugin/src/it/jetty-run-mojo-it/invoker.properties deleted file mode 100644 index e0222d4d54e..00000000000 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/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-it/jetty-simple-base/pom.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/pom.xml deleted file mode 100644 index 601aae0d1d1..00000000000 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - 4.0.0 - - - org.eclipse.jetty.its.jetty-run-mojo-it - jetty-simple-project - 0.0.1-SNAPSHOT - - - jetty-simple-base - jar - - Jetty :: Simple :: Base - - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - - org.slf4j - slf4j-api - - - commons-io - commons-io - - - org.eclipse.jetty.toolchain - jetty-perf-helper - - - com.fasterxml.jackson.core - jackson-databind - - - - diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/HelloServlet.java b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/HelloServlet.java deleted file mode 100644 index 5cf82ccf88e..00000000000 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/HelloServlet.java +++ /dev/null @@ -1,44 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package org.eclipse.jetty.its.jetty_run_mojo_it; - -import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * - */ -@WebServlet("/hello") -public class HelloServlet - extends HttpServlet -{ - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException - { - String who = req.getParameter("name"); - - resp.getWriter().write("Hello " + (who == null ? "unknown" : who)); - } -} diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/PingServlet.java b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/PingServlet.java deleted file mode 100644 index 48152a7b735..00000000000 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/PingServlet.java +++ /dev/null @@ -1,39 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package org.eclipse.jetty.its.jetty_run_mojo_it; - -import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -public class PingServlet - extends HttpServlet -{ - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException - { - String who = req.getParameter("name"); - - resp.getWriter().write("pong " + (who == null ? "unknown" : who)); - } -} diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml deleted file mode 100644 index a1ec4e27ce4..00000000000 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - FragmentA - - - - - - - Ping - org.eclipse.jetty.its.jetty_run_mojo_it.PingServlet - - extra1123 - - - extra2345 - - - - - Ping - /ping - - - - \ No newline at end of file diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it_test/HelloTestServlet.java b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it_test/HelloTestServlet.java deleted file mode 100644 index 91c72bacf55..00000000000 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it_test/HelloTestServlet.java +++ /dev/null @@ -1,44 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package org.eclipse.jetty.its.jetty_run_mojo_it_test; - -import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * - */ -@WebServlet("/testhello") -public class HelloTestServlet - extends HttpServlet -{ - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException - { - String who = req.getParameter("name"); - - resp.getWriter().write("Hello from test " + (who == null ? "unknown" : who)); - } -} diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml deleted file mode 100644 index d17cc126f78..00000000000 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - 4.0.0 - - - org.eclipse.jetty.its.jetty-run-mojo-it - jetty-simple-project - 0.0.1-SNAPSHOT - - - jetty-simple-webapp - war - - Jetty :: Simple :: Webapp - - - ${project.build.directory}/jetty-run-mojo.txt - - - - - org.eclipse.jetty.its.jetty-run-mojo-it - jetty-simple-base - - - org.eclipse.jetty.its.jetty-run-mojo-it - jetty-simple-base - test - test-jar - - - org.slf4j - slf4j-simple - - - org.eclipse.jetty - jetty-servlet - provided - - - org.eclipse.jetty - jetty-client - test - - - org.apache.commons - commons-lang3 - test - - - 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} - true - true - true - ${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 - true - - - - - - - - diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/src/config/jetty.xml deleted file mode 100644 index ced70a66d09..00000000000 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/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-it/jetty-simple-webapp/src/main/webapp/WEB-INF/web.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 2a5ac4b71bf..00000000000 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - Jetty Simple Webapp run-mojo-it - diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-it/pom.xml deleted file mode 100644 index d082c71bbe5..00000000000 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - - - org.eclipse.jetty.its - it-parent-pom - 0.0.1-SNAPSHOT - - - org.eclipse.jetty.its.jetty-run-mojo-it - jetty-simple-project - 0.0.1-SNAPSHOT - pom - - Jetty :: Simple - - - UTF-8 - UTF-8 - 1.8 - @project.version@ - - - - jetty-simple-base - jetty-simple-webapp - - - - - - org.eclipse.jetty.its.jetty-run-mojo-it - jetty-simple-base - ${project.version} - - - org.eclipse.jetty.its.jetty-run-mojo-it - jetty-simple-base - ${project.version} - test - test-jar - - - - - diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/postbuild.groovy b/jetty-maven-plugin/src/it/jetty-run-mojo-it/postbuild.groovy deleted file mode 100644 index d0cf33391a6..00000000000 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/postbuild.groovy +++ /dev/null @@ -1,23 +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( 'pingServlet ok') -assert buildLog.text.contains( 'helloServlet')