Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 580B4F6AC for ; Mon, 2 Sep 2013 06:09:52 +0000 (UTC) Received: (qmail 70272 invoked by uid 500); 2 Sep 2013 06:09:50 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 70151 invoked by uid 500); 2 Sep 2013 06:09:50 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 70133 invoked by uid 99); 2 Sep 2013 06:09:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Sep 2013 06:09:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Sep 2013 06:09:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 462EC2388A56 for ; Mon, 2 Sep 2013 06:09:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1519350 - /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java Date: Mon, 02 Sep 2013 06:09:25 -0000 To: dev@tomcat.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130902060925.462EC2388A56@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Mon Sep 2 06:09:24 2013 New Revision: 1519350 URL: http://svn.apache.org/r1519350 Log: display more info only if users choose to use -e or -X maven option Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java?rev=1519350&r1=1519349&r2=1519350&view=diff ============================================================================== --- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java (original) +++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java Mon Sep 2 06:09:24 2013 @@ -35,7 +35,7 @@ public abstract class AbstractI18NTomcat extends AbstractMojo { - @Component( role = MessagesProvider.class ) + @Component(role = MessagesProvider.class) protected MessagesProvider messagesProvider; // ---------------------------------------------------------------------- @@ -46,7 +46,7 @@ public abstract class AbstractI18NTomcat * The webapp context path to use for the web application being run. This must always start with a forward-slash * ('/'). */ - @Parameter( property = "maven.tomcat.path", defaultValue = "/${project.artifactId}", required = true ) + @Parameter(property = "maven.tomcat.path", defaultValue = "/${project.artifactId}", required = true) protected String path; @@ -54,23 +54,25 @@ public abstract class AbstractI18NTomcat { return path; } - + /** * Check response of Tomcat to know if ok or not. - * + * * @param tomcatResponse response of tomcat return by TomcatManager class - * * @throws MojoExecutionException if HTTP status code greater than 400 (included) */ - protected void checkTomcatResponse(final TomcatManagerResponse tomcatResponse) - throws MojoExecutionException + protected void checkTomcatResponse( final TomcatManagerResponse tomcatResponse ) + throws MojoExecutionException { - final int statusCode = tomcatResponse.getStatusCode() ; - - if (statusCode >= 400) { - getLog().error(tomcatResponse.getHttpResponseBody()) ; - - throw new MojoExecutionException( messagesProvider.getMessage("AbstractI18NTomcat6Mojo.tomcatHttStatusError", statusCode)) ; - } - } + final int statusCode = tomcatResponse.getStatusCode(); + + if ( statusCode >= 400 ) + { + getLog().error( messagesProvider.getMessage( "AbstractI18NTomcat6Mojo.tomcatHttStatusError", statusCode ) ); + + throw new MojoExecutionException( + messagesProvider.getMessage( "AbstractI18NTomcat6Mojo.tomcatHttStatusError", statusCode ) + ": " + + tomcatResponse.getHttpResponseBody() ); + } + } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org