diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java index 73325977e4..96eb4c3f5d 100644 --- a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java +++ b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java @@ -100,12 +100,25 @@ public class RunMojo extends AbstractBaseScmMojo * * * @return + * @deprecated use {@link #getLoggingConfiguration()} instead */ + @Deprecated public String getLoggginConfiguration() { return loggginConfiguration; } + /** + * Method description + * + * + * @return + */ + public String getLoggingConfiguration() + { + return loggingConfiguration; + } + /** * Method description * @@ -201,12 +214,25 @@ public class RunMojo extends AbstractBaseScmMojo * * * @param loggginConfiguration + * @deprecated use {@link #setLoggingConfiguration(java.lang.String)} instead */ + @Deprecated public void setLoggginConfiguration(String loggginConfiguration) { this.loggginConfiguration = loggginConfiguration; } + /** + * Method description + * + * + * @param loggingConfiguration + */ + public void setLoggingConfiguration(String loggingConfiguration) + { + this.loggingConfiguration = loggingConfiguration; + } + /** * Method description * @@ -272,6 +298,8 @@ public class RunMojo extends AbstractBaseScmMojo * @param warFile * * @throws MojoFailureException + * + * @throws MojoExecutionException */ private void runServletContainer(File warFile) throws MojoExecutionException { @@ -283,8 +311,13 @@ public class RunMojo extends AbstractBaseScmMojo System.setProperty("scm.stage", stage); System.out.println("SET STAGE " + stage); + if (loggingConfiguration == null) + { + loggingConfiguration = loggginConfiguration; + } + // enable debug logging - System.setProperty("logback.configurationFile", loggginConfiguration); + System.setProperty("logback.configurationFile", loggingConfiguration); Server server = new Server(); SelectChannelConnector connector = new SelectChannelConnector(); @@ -294,7 +327,7 @@ public class RunMojo extends AbstractBaseScmMojo if (openBrowser && Desktop.isDesktopSupported()) { connector.addLifeCycleListener(new OpenBrowserListener(getLog(), port, - contextPath)); + contextPath)); } connector.setPort(port); @@ -333,10 +366,15 @@ public class RunMojo extends AbstractBaseScmMojo private String contextPath = "/scm"; /** - * @parameter expression="${loggingConfiguration}" default-value="/logback.default.xml" + * @parameter */ private String loggginConfiguration; + /** + * @parameter expression="${loggingConfiguration}" default-value="/logback.default.xml" + */ + private String loggingConfiguration; + /** * @parameter */