From 557cd83713388ac2dfebfd4930d3a302ab459029 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Tue, 24 Sep 2019 17:07:03 +1000 Subject: [PATCH] Issue #1743 Rename mojos. Signed-off-by: Jan Bartel --- .../{NewJettyEffectiveWebXml.java => JettyEffectiveWebXml.java} | 2 +- .../maven/plugin/{NewJettyRunMojo.java => JettyRunMojo.java} | 2 +- .../plugin/{NewJettyRunWarMojo.java => JettyRunWarMojo.java} | 2 +- .../plugin/{NewJettyStartMojo.java => JettyStartMojo.java} | 2 +- .../{NewJettyStartWarMojo.java => JettyStartWarMojo.java} | 2 +- .../maven/plugin/{NewJettyStopMojo.java => JettyStopMojo.java} | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/{NewJettyEffectiveWebXml.java => JettyEffectiveWebXml.java} (97%) rename jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/{NewJettyRunMojo.java => JettyRunMojo.java} (99%) rename jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/{NewJettyRunWarMojo.java => JettyRunWarMojo.java} (99%) rename jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/{NewJettyStartMojo.java => JettyStartMojo.java} (98%) rename jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/{NewJettyStartWarMojo.java => JettyStartWarMojo.java} (98%) rename jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/{NewJettyStopMojo.java => JettyStopMojo.java} (98%) diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyEffectiveWebXml.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java similarity index 97% rename from jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyEffectiveWebXml.java rename to jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java index c27f69390ed..ef983f8eaf6 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyEffectiveWebXml.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java @@ -33,7 +33,7 @@ import org.eclipse.jetty.util.StringUtil; * */ @Mojo(name = "effective-web-xml", requiresDependencyResolution = ResolutionScope.RUNTIME) -public class NewJettyEffectiveWebXml extends AbstractWebAppMojo +public class JettyEffectiveWebXml extends AbstractWebAppMojo { /** * The name of the file to generate into diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyRunMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java similarity index 99% rename from jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyRunMojo.java rename to jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java index e3c317eb764..1d4da76a1e8 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyRunMojo.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java @@ -53,7 +53,7 @@ import org.eclipse.jetty.webapp.WebAppContext; */ @Mojo (name="run", requiresDependencyResolution = ResolutionScope.TEST) @Execute (phase = LifecyclePhase.TEST_COMPILE) -public class NewJettyRunMojo extends AbstractWebAppMojo +public class JettyRunMojo extends AbstractWebAppMojo { //Start of parameters only valid for runType=inprocess /** diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyRunWarMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarMojo.java similarity index 99% rename from jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyRunWarMojo.java rename to jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarMojo.java index 2ab9c269232..821b85777fc 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyRunWarMojo.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarMojo.java @@ -49,7 +49,7 @@ import org.eclipse.jetty.util.StringUtil; */ @Mojo( name = "run-war", requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME) @Execute(phase = LifecyclePhase.PACKAGE) -public class NewJettyRunWarMojo extends AbstractWebAppMojo +public class JettyRunWarMojo extends AbstractWebAppMojo { //Start of parameters only valid for runType=EMBED /** diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyStartMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyStartMojo.java similarity index 98% rename from jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyStartMojo.java rename to jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyStartMojo.java index 4e416a36710..0c9a1e8847b 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyStartMojo.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyStartMojo.java @@ -39,7 +39,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope; */ @Mojo(name = "start", requiresDependencyResolution = ResolutionScope.TEST) @Execute(phase = LifecyclePhase.VALIDATE) -public class NewJettyStartMojo extends AbstractWebAppMojo +public class JettyStartMojo extends AbstractWebAppMojo { @Override protected void configureWebApp() throws Exception diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyStartWarMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyStartWarMojo.java similarity index 98% rename from jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyStartWarMojo.java rename to jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyStartWarMojo.java index 4f5751c6d4d..0afc0b2e8c8 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyStartWarMojo.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyStartWarMojo.java @@ -47,7 +47,7 @@ import org.eclipse.jetty.util.StringUtil; *

*/ @Mojo(name = "start-war", requiresDependencyResolution = ResolutionScope.RUNTIME) -public class NewJettyStartWarMojo extends AbstractWebAppMojo +public class JettyStartWarMojo extends AbstractWebAppMojo { protected JettyEmbedder embedder; protected JettyForker forker; diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyStopMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyStopMojo.java similarity index 98% rename from jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyStopMojo.java rename to jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyStopMojo.java index 45b0912a12f..2a4dc69c118 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/NewJettyStopMojo.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyStopMojo.java @@ -39,7 +39,7 @@ import org.apache.maven.plugins.annotations.Parameter; * configure which jetty to stop. */ @Mojo(name = "stop") -public class NewJettyStopMojo extends AbstractWebAppMojo +public class JettyStopMojo extends AbstractWebAppMojo { /** * Max time in seconds that the plugin will wait for confirmation that jetty has stopped.