From b8759bc2c7f91a633e3fae4be76f0665c3aa6203 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 10 Jul 2017 18:17:16 -0700 Subject: [PATCH] Renaming to fit Eclipse Jetty naming guidelines --- .../jetty-simple-base/pom.xml | 2 +- .../its/jetty_run_mojo_it/HelloServlet.java | 2 +- .../its/jetty_run_mojo_it/PingServlet.java | 2 +- .../main/resources/META-INF/web-fragment.xml | 2 +- .../jetty-simple-webapp/pom.xml | 4 +- .../jetty_run_mojo_it/TestHelloServlet.java | 2 +- .../src/it/jetty-run-forked-mojo-it/pom.xml | 4 +- .../jetty-simple-base/pom.xml | 2 +- .../its/jetty_run_mojo_it/HelloServlet.java | 2 +- .../its/jetty_run_mojo_it/PingServlet.java | 2 +- .../main/resources/META-INF/web-fragment.xml | 2 +- .../jetty-simple-webapp/pom.xml | 4 +- .../jetty_run_mojo_it/TestHelloServlet.java | 2 +- .../src/it/jetty-run-mojo-it/pom.xml | 4 +- .../jetty-simple-base/pom.xml | 2 +- .../its/jetty_run_mojo_it/HelloServlet.java | 2 +- .../its/jetty_run_mojo_it/PingServlet.java | 2 +- .../main/resources/META-INF/web-fragment.xml | 2 +- .../jetty-simple-webapp/pom.xml | 4 +- .../jetty_run_mojo_it/TestHelloServlet.java | 2 +- .../it/jetty-run-war-exploded-mojo-it/pom.xml | 4 +- .../jetty-simple-base/pom.xml | 2 +- .../its/jetty_run_mojo_it/HelloServlet.java | 2 +- .../its/jetty_run_mojo_it/PingServlet.java | 2 +- .../main/resources/META-INF/web-fragment.xml | 2 +- .../jetty-simple-webapp/pom.xml | 4 +- .../jetty_run_mojo_it/TestHelloServlet.java | 2 +- .../src/it/jetty-run-war-mojo-it/pom.xml | 4 +- .../jetty-simple-base/pom.xml | 2 +- .../its/jetty_run_mojo_it/HelloServlet.java | 45 ------------------- .../its/jetty_run_mojo_it/PingServlet.java | 41 ----------------- .../its/jetty_run_mojo_it/HelloServlet.java | 45 +++++++++++++++++++ .../its/jetty_run_mojo_it/PingServlet.java | 41 +++++++++++++++++ .../main/resources/META-INF/web-fragment.xml | 2 +- .../jetty-simple-webapp/pom.xml | 4 +- .../jetty_run_mojo_it/TestHelloServlet.java | 2 +- .../src/it/jetty-start-mojo-it/pom.xml | 4 +- 37 files changed, 129 insertions(+), 129 deletions(-) rename jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/src/main/java/{com/webtide => org/eclipse}/jetty/its/jetty_run_mojo_it/HelloServlet.java (96%) rename jetty-maven-plugin/src/it/{jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/java/com/webtide => jetty-run-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse}/jetty/its/jetty_run_mojo_it/PingServlet.java (96%) rename jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/src/test/java/{com/webtide => org/eclipse}/jetty/its/jetty_run_mojo_it/TestHelloServlet.java (97%) rename jetty-maven-plugin/src/it/{jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/java/com/webtide => jetty-run-mojo-it/jetty-simple-base/src/main/java/org/eclipse}/jetty/its/jetty_run_mojo_it/HelloServlet.java (96%) rename jetty-maven-plugin/src/it/{jetty-run-forked-mojo-it/jetty-simple-base/src/main/java/com/webtide => jetty-run-mojo-it/jetty-simple-base/src/main/java/org/eclipse}/jetty/its/jetty_run_mojo_it/PingServlet.java (96%) rename jetty-maven-plugin/src/it/{jetty-run-war-exploded-mojo-it/jetty-simple-webapp/src/test/java/com/webtide => jetty-run-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse}/jetty/its/jetty_run_mojo_it/TestHelloServlet.java (97%) rename jetty-maven-plugin/src/it/{jetty-run-war-mojo-it/jetty-simple-base/src/main/java/com/webtide => jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/java/org/eclipse}/jetty/its/jetty_run_mojo_it/HelloServlet.java (96%) rename jetty-maven-plugin/src/it/{jetty-run-mojo-it/jetty-simple-base/src/main/java/com/webtide => jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/java/org/eclipse}/jetty/its/jetty_run_mojo_it/PingServlet.java (96%) rename jetty-maven-plugin/src/it/{jetty-run-mojo-it/jetty-simple-webapp/src/test/java/com/webtide => jetty-run-war-exploded-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse}/jetty/its/jetty_run_mojo_it/TestHelloServlet.java (97%) rename jetty-maven-plugin/src/it/{jetty-run-mojo-it/jetty-simple-base/src/main/java/com/webtide => jetty-run-war-mojo-it/jetty-simple-base/src/main/java/org/eclipse}/jetty/its/jetty_run_mojo_it/HelloServlet.java (96%) rename jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/src/main/java/{com/webtide => org/eclipse}/jetty/its/jetty_run_mojo_it/PingServlet.java (96%) rename jetty-maven-plugin/src/it/{jetty-start-mojo-it/jetty-simple-webapp/src/test/java/com/webtide => jetty-run-war-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse}/jetty/its/jetty_run_mojo_it/TestHelloServlet.java (97%) delete mode 100644 jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/HelloServlet.java delete mode 100644 jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/PingServlet.java create mode 100644 jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/HelloServlet.java create mode 100644 jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/PingServlet.java rename jetty-maven-plugin/src/it/{jetty-run-war-mojo-it/jetty-simple-webapp/src/test/java/com/webtide => jetty-start-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse}/jetty/its/jetty_run_mojo_it/TestHelloServlet.java (97%) diff --git a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/pom.xml b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/pom.xml index 594ddba4c8d..7cb2a2e00be 100644 --- a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.webtide.jetty.its.jetty-run-forked-mojo-it + org.eclipse.jetty.its.jetty-run-forked-mojo-it jetty-simple-project 0.0.1-SNAPSHOT diff --git a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/HelloServlet.java b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/HelloServlet.java similarity index 96% rename from jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/HelloServlet.java rename to jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/HelloServlet.java index a6d2a3e256d..b45f5d2c476 100644 --- a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/HelloServlet.java +++ b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/HelloServlet.java @@ -17,7 +17,7 @@ // -package com.webtide.jetty.its.jetty_run_mojo_it; +package org.eclipse.jetty.its.jetty_run_mojo_it; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; diff --git a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/PingServlet.java b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/PingServlet.java similarity index 96% rename from jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/PingServlet.java rename to jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/PingServlet.java index f5686592252..c43fe013720 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/PingServlet.java +++ b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/PingServlet.java @@ -17,7 +17,7 @@ // -package com.webtide.jetty.its.jetty_run_mojo_it; +package org.eclipse.jetty.its.jetty_run_mojo_it; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; diff --git a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml index 031012f7fed..a1ec4e27ce4 100644 --- a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml +++ b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml @@ -14,7 +14,7 @@ Ping - com.webtide.jetty.its.jetty_run_mojo_it.PingServlet + org.eclipse.jetty.its.jetty_run_mojo_it.PingServlet extra1123 diff --git a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml index 3c6f21d22ea..fa400e45aa1 100644 --- a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.webtide.jetty.its.jetty-run-forked-mojo-it + org.eclipse.jetty.its.jetty-run-forked-mojo-it jetty-simple-project 0.0.1-SNAPSHOT @@ -22,7 +22,7 @@ - com.webtide.jetty.its.jetty-run-forked-mojo-it + org.eclipse.jetty.its.jetty-run-forked-mojo-it jetty-simple-base diff --git a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/src/test/java/com/webtide/jetty/its/jetty_run_mojo_it/TestHelloServlet.java b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it/TestHelloServlet.java similarity index 97% rename from jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/src/test/java/com/webtide/jetty/its/jetty_run_mojo_it/TestHelloServlet.java rename to jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it/TestHelloServlet.java index f48eee38074..31a195c1407 100644 --- a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/src/test/java/com/webtide/jetty/its/jetty_run_mojo_it/TestHelloServlet.java +++ b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it/TestHelloServlet.java @@ -16,7 +16,7 @@ // ======================================================================== // -package com.webtide.jetty.its.jetty_run_mojo_it; +package org.eclipse.jetty.its.jetty_run_mojo_it; import org.eclipse.jetty.client.HttpClient; import org.junit.Assert; diff --git a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/pom.xml index cada3739cce..fae3f39a0c6 100644 --- a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.webtide.jetty.its.jetty-run-forked-mojo-it + org.eclipse.jetty.its.jetty-run-forked-mojo-it jetty-simple-project 0.0.1-SNAPSHOT pom @@ -27,7 +27,7 @@ - com.webtide.jetty.its.jetty-run-forked-mojo-it + org.eclipse.jetty.its.jetty-run-forked-mojo-it jetty-simple-base ${project.version} 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 index c29b270cb61..94e3cf2b8ee 100644 --- 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 @@ -4,7 +4,7 @@ 4.0.0 - com.webtide.jetty.its.jetty-run-mojo-it + org.eclipse.jetty.its.jetty-run-mojo-it jetty-simple-project 0.0.1-SNAPSHOT diff --git a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/java/com/webtide/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 similarity index 96% rename from jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/HelloServlet.java rename to 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 index a6d2a3e256d..b45f5d2c476 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/java/com/webtide/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 @@ -17,7 +17,7 @@ // -package com.webtide.jetty.its.jetty_run_mojo_it; +package org.eclipse.jetty.its.jetty_run_mojo_it; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; diff --git a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/src/main/java/com/webtide/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 similarity index 96% rename from jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/PingServlet.java rename to 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 index f5686592252..c43fe013720 100644 --- a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/src/main/java/com/webtide/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 @@ -17,7 +17,7 @@ // -package com.webtide.jetty.its.jetty_run_mojo_it; +package org.eclipse.jetty.its.jetty_run_mojo_it; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; 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 index 031012f7fed..a1ec4e27ce4 100644 --- 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 @@ -14,7 +14,7 @@ Ping - com.webtide.jetty.its.jetty_run_mojo_it.PingServlet + org.eclipse.jetty.its.jetty_run_mojo_it.PingServlet extra1123 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 index ce4d50f13ec..7fb521911d7 100644 --- 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 @@ -4,7 +4,7 @@ 4.0.0 - com.webtide.jetty.its.jetty-run-mojo-it + org.eclipse.jetty.its.jetty-run-mojo-it jetty-simple-project 0.0.1-SNAPSHOT @@ -17,7 +17,7 @@ - com.webtide.jetty.its.jetty-run-mojo-it + org.eclipse.jetty.its.jetty-run-mojo-it jetty-simple-base diff --git a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/src/test/java/com/webtide/jetty/its/jetty_run_mojo_it/TestHelloServlet.java b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it/TestHelloServlet.java similarity index 97% rename from jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/src/test/java/com/webtide/jetty/its/jetty_run_mojo_it/TestHelloServlet.java rename to jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it/TestHelloServlet.java index 4e3ced68d91..5d700a60525 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/src/test/java/com/webtide/jetty/its/jetty_run_mojo_it/TestHelloServlet.java +++ b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it/TestHelloServlet.java @@ -17,7 +17,7 @@ // -package com.webtide.jetty.its.jetty_run_mojo_it; +package org.eclipse.jetty.its.jetty_run_mojo_it; import org.eclipse.jetty.client.HttpClient; import org.junit.Assert; 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 index 3d303f4caf8..213a79af16b 100644 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-mojo-it/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.webtide.jetty.its.jetty-run-mojo-it + org.eclipse.jetty.its.jetty-run-mojo-it jetty-simple-project 0.0.1-SNAPSHOT pom @@ -27,7 +27,7 @@ - com.webtide.jetty.its.jetty-run-mojo-it + org.eclipse.jetty.its.jetty-run-mojo-it jetty-simple-base ${project.version} diff --git a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/pom.xml index 4425c34f117..3ae1e093bb8 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.webtide.jetty.its.jetty-run-war-exploded-mojo-it + org.eclipse.jetty.its.jetty-run-war-exploded-mojo-it jetty-simple-project 0.0.1-SNAPSHOT diff --git a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/HelloServlet.java b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/HelloServlet.java similarity index 96% rename from jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/HelloServlet.java rename to jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/HelloServlet.java index a6d2a3e256d..b45f5d2c476 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/HelloServlet.java +++ b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/HelloServlet.java @@ -17,7 +17,7 @@ // -package com.webtide.jetty.its.jetty_run_mojo_it; +package org.eclipse.jetty.its.jetty_run_mojo_it; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/PingServlet.java b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/PingServlet.java similarity index 96% rename from jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/PingServlet.java rename to jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/PingServlet.java index f5686592252..c43fe013720 100644 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/PingServlet.java +++ b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/PingServlet.java @@ -17,7 +17,7 @@ // -package com.webtide.jetty.its.jetty_run_mojo_it; +package org.eclipse.jetty.its.jetty_run_mojo_it; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; diff --git a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml index 031012f7fed..a1ec4e27ce4 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml @@ -14,7 +14,7 @@ Ping - com.webtide.jetty.its.jetty_run_mojo_it.PingServlet + org.eclipse.jetty.its.jetty_run_mojo_it.PingServlet extra1123 diff --git a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml index 0489e0e1a2c..6cab86275c0 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.webtide.jetty.its.jetty-run-war-exploded-mojo-it + org.eclipse.jetty.its.jetty-run-war-exploded-mojo-it jetty-simple-project 0.0.1-SNAPSHOT @@ -17,7 +17,7 @@ - com.webtide.jetty.its.jetty-run-war-exploded-mojo-it + org.eclipse.jetty.its.jetty-run-war-exploded-mojo-it jetty-simple-base diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/src/test/java/com/webtide/jetty/its/jetty_run_mojo_it/TestHelloServlet.java b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it/TestHelloServlet.java similarity index 97% rename from jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/src/test/java/com/webtide/jetty/its/jetty_run_mojo_it/TestHelloServlet.java rename to jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it/TestHelloServlet.java index 4e3ced68d91..5d700a60525 100644 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/src/test/java/com/webtide/jetty/its/jetty_run_mojo_it/TestHelloServlet.java +++ b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it/TestHelloServlet.java @@ -17,7 +17,7 @@ // -package com.webtide.jetty.its.jetty_run_mojo_it; +package org.eclipse.jetty.its.jetty_run_mojo_it; import org.eclipse.jetty.client.HttpClient; import org.junit.Assert; diff --git a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/pom.xml index 5b88c8fd196..a6ef2713d27 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.webtide.jetty.its.jetty-run-war-exploded-mojo-it + org.eclipse.jetty.its.jetty-run-war-exploded-mojo-it jetty-simple-project 0.0.1-SNAPSHOT pom @@ -27,7 +27,7 @@ - com.webtide.jetty.its.jetty-run-war-exploded-mojo-it + org.eclipse.jetty.its.jetty-run-war-exploded-mojo-it jetty-simple-base ${project.version} diff --git a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/pom.xml index 8903e68d8a0..8f0aab6e5ad 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.webtide.jetty.its.jetty-run-war-mojo-it + org.eclipse.jetty.its.jetty-run-war-mojo-it jetty-simple-project 0.0.1-SNAPSHOT diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/HelloServlet.java b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/HelloServlet.java similarity index 96% rename from jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/HelloServlet.java rename to jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/HelloServlet.java index a6d2a3e256d..b45f5d2c476 100644 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/HelloServlet.java +++ b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/HelloServlet.java @@ -17,7 +17,7 @@ // -package com.webtide.jetty.its.jetty_run_mojo_it; +package org.eclipse.jetty.its.jetty_run_mojo_it; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; diff --git a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/PingServlet.java b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/PingServlet.java similarity index 96% rename from jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/PingServlet.java rename to jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/PingServlet.java index f5686592252..c43fe013720 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/PingServlet.java +++ b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/PingServlet.java @@ -17,7 +17,7 @@ // -package com.webtide.jetty.its.jetty_run_mojo_it; +package org.eclipse.jetty.its.jetty_run_mojo_it; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; diff --git a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml index 031012f7fed..a1ec4e27ce4 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml @@ -14,7 +14,7 @@ Ping - com.webtide.jetty.its.jetty_run_mojo_it.PingServlet + org.eclipse.jetty.its.jetty_run_mojo_it.PingServlet extra1123 diff --git a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml index 23109b90f00..f9ba41b965d 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.webtide.jetty.its.jetty-run-war-mojo-it + org.eclipse.jetty.its.jetty-run-war-mojo-it jetty-simple-project 0.0.1-SNAPSHOT @@ -17,7 +17,7 @@ - com.webtide.jetty.its.jetty-run-war-mojo-it + org.eclipse.jetty.its.jetty-run-war-mojo-it jetty-simple-base diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/test/java/com/webtide/jetty/its/jetty_run_mojo_it/TestHelloServlet.java b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it/TestHelloServlet.java similarity index 97% rename from jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/test/java/com/webtide/jetty/its/jetty_run_mojo_it/TestHelloServlet.java rename to jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it/TestHelloServlet.java index 4e3ced68d91..5d700a60525 100644 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/test/java/com/webtide/jetty/its/jetty_run_mojo_it/TestHelloServlet.java +++ b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it/TestHelloServlet.java @@ -17,7 +17,7 @@ // -package com.webtide.jetty.its.jetty_run_mojo_it; +package org.eclipse.jetty.its.jetty_run_mojo_it; import org.eclipse.jetty.client.HttpClient; import org.junit.Assert; diff --git a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/pom.xml index 432f0120781..a48c4d51db1 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.webtide.jetty.its.jetty-run-war-mojo-it + org.eclipse.jetty.its.jetty-run-war-mojo-it jetty-simple-project 0.0.1-SNAPSHOT pom @@ -27,7 +27,7 @@ - com.webtide.jetty.its.jetty-run-war-mojo-it + org.eclipse.jetty.its.jetty-run-war-mojo-it jetty-simple-base ${project.version} diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/pom.xml b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/pom.xml index 7a9a5382308..a5e1cb9cea5 100644 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.webtide.jetty.its.jetty-start-mojo-it + org.eclipse.jetty.its.jetty-start-mojo-it jetty-simple-project 0.0.1-SNAPSHOT diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/HelloServlet.java b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/HelloServlet.java deleted file mode 100644 index a6d2a3e256d..00000000000 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/HelloServlet.java +++ /dev/null @@ -1,45 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2017 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 com.webtide.jetty.its.jetty_run_mojo_it; - -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -/** - * - */ -@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-start-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/PingServlet.java b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/PingServlet.java deleted file mode 100644 index f5686592252..00000000000 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/src/main/java/com/webtide/jetty/its/jetty_run_mojo_it/PingServlet.java +++ /dev/null @@ -1,41 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2017 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 com.webtide.jetty.its.jetty_run_mojo_it; - -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -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-start-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-start-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/HelloServlet.java new file mode 100644 index 00000000000..b45f5d2c476 --- /dev/null +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/HelloServlet.java @@ -0,0 +1,45 @@ +// +// ======================================================================== +// Copyright (c) 1995-2017 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 javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * + */ +@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-start-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-start-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/PingServlet.java new file mode 100644 index 00000000000..c43fe013720 --- /dev/null +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/src/main/java/org/eclipse/jetty/its/jetty_run_mojo_it/PingServlet.java @@ -0,0 +1,41 @@ +// +// ======================================================================== +// Copyright (c) 1995-2017 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 javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +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-start-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml index 031012f7fed..a1ec4e27ce4 100644 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/src/main/resources/META-INF/web-fragment.xml @@ -14,7 +14,7 @@ Ping - com.webtide.jetty.its.jetty_run_mojo_it.PingServlet + org.eclipse.jetty.its.jetty_run_mojo_it.PingServlet extra1123 diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml index 38ae1555a4b..fdb6bf16cff 100644 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.webtide.jetty.its.jetty-start-mojo-it + org.eclipse.jetty.its.jetty-start-mojo-it jetty-simple-project 0.0.1-SNAPSHOT @@ -17,7 +17,7 @@ - com.webtide.jetty.its.jetty-start-mojo-it + org.eclipse.jetty.its.jetty-start-mojo-it jetty-simple-base diff --git a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/src/test/java/com/webtide/jetty/its/jetty_run_mojo_it/TestHelloServlet.java b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it/TestHelloServlet.java similarity index 97% rename from jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/src/test/java/com/webtide/jetty/its/jetty_run_mojo_it/TestHelloServlet.java rename to jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it/TestHelloServlet.java index 4e3ced68d91..5d700a60525 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/src/test/java/com/webtide/jetty/its/jetty_run_mojo_it/TestHelloServlet.java +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it/TestHelloServlet.java @@ -17,7 +17,7 @@ // -package com.webtide.jetty.its.jetty_run_mojo_it; +package org.eclipse.jetty.its.jetty_run_mojo_it; import org.eclipse.jetty.client.HttpClient; import org.junit.Assert; diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-start-mojo-it/pom.xml index 7319c0d604f..58add42c68c 100644 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.webtide.jetty.its.jetty-start-mojo-it + org.eclipse.jetty.its.jetty-start-mojo-it jetty-simple-project 0.0.1-SNAPSHOT pom @@ -27,7 +27,7 @@ - com.webtide.jetty.its.jetty-start-mojo-it + org.eclipse.jetty.its.jetty-start-mojo-it jetty-simple-base ${project.version}