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 708A510A49 for ; Mon, 2 Sep 2013 19:43:30 +0000 (UTC) Received: (qmail 79115 invoked by uid 500); 2 Sep 2013 19:43:29 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 78848 invoked by uid 500); 2 Sep 2013 19:43:29 -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 78834 invoked by uid 99); 2 Sep 2013 19:43:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Sep 2013 19:43:28 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of knst.kolinko@gmail.com designates 74.125.82.45 as permitted sender) Received: from [74.125.82.45] (HELO mail-wg0-f45.google.com) (74.125.82.45) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Sep 2013 19:43:23 +0000 Received: by mail-wg0-f45.google.com with SMTP id y10so3850046wgg.12 for ; Mon, 02 Sep 2013 12:43:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=gnCldfsQSXM9f0slwfSbrocdsfJ6T1WrVE8S9p0RSsU=; b=TLm7P6XmIUs6LpwH3mcaPO+lmgv0/5KXu0RMFwYbJrf0OGPk7kNjCVEZAkd9wIvpRi duTtgP3COz8Emb9gjS/IG2KLDFFazBCXXgo35b/O2CDjFPvu8TFCfXa/28e7nubinzuY oadR80l6qRHnWy6I1FaCkulZ2gVN2eYj+M0Silaef3LNazynPBLNdcXogvi2bPDzpj7D 3jX226awDHnSMgel8Oau3CGrIQpfpRQFBdKVg6UygL/Kpi/FPlQHBGXLRkjKtae2jf63 V3xOd0RYNHxyPsjQvwPjnZhruLeoNQ2QqEQrp7LOoeqTvCmR3Ver4B68Ms3SpvFQhhBF KDEw== MIME-Version: 1.0 X-Received: by 10.180.126.9 with SMTP id mu9mr14963802wib.16.1378150982350; Mon, 02 Sep 2013 12:43:02 -0700 (PDT) Received: by 10.216.161.196 with HTTP; Mon, 2 Sep 2013 12:43:02 -0700 (PDT) In-Reply-To: <20130902061111.698A22388A56@eris.apache.org> References: <20130902061111.698A22388A56@eris.apache.org> Date: Mon, 2 Sep 2013 23:43:02 +0400 Message-ID: Subject: Re: svn commit: r1519353 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/ tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ tomcat7-maven-plugin/src/main/java/o... From: Konstantin Kolinko To: Tomcat Developers List Content-Type: text/plain; charset=ISO-8859-1 X-Virus-Checked: Checked by ClamAV on apache.org 2013/9/2 : > Author: olamy > Date: Mon Sep 2 06:11:10 2013 > New Revision: 1519353 > > URL: http://svn.apache.org/r1519353 > Log: > display the reason phrase too > > Modified: > tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages.properties > tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java > tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java > > Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages.properties > URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages.properties?rev=1519353&r1=1519352&r2=1519353&view=diff > ============================================================================== > --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages.properties (original) > +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages.properties Mon Sep 2 06:11:10 2013 > @@ -112,4 +112,4 @@ AbstractI18NTomcat6Mojo.tomcatHttStatusE > > #AbstractTomcat7Mojo > > -AbstractTomcat7Mojo.tomcatHttStatusError = Tomcat return http status error: {0} > +AbstractTomcat7Mojo.tomcatHttStatusError = Tomcat return http status error: {0}, Reason Phrase: {1} 1. Typo in message key: s/ Htt / Http / ? 2. The file below references "AbstractI18NTomcat6Mojo.tomcatHttStatusError", but the message above is "Tomcat7" one. Haven't you forgotten to change "Tomcat6" message as well? Best regards, Konstantin Kolinko > > 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=1519353&r1=1519352&r2=1519353&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:11:10 2013 > @@ -68,10 +68,12 @@ public abstract class AbstractI18NTomcat > > if ( statusCode >= 400 ) > { > - getLog().error( messagesProvider.getMessage( "AbstractI18NTomcat6Mojo.tomcatHttStatusError", statusCode ) ); > + getLog().error( messagesProvider.getMessage( "AbstractI18NTomcat6Mojo.tomcatHttStatusError", statusCode, > + tomcatResponse.getReasonPhrase() ) ); > > throw new MojoExecutionException( > - messagesProvider.getMessage( "AbstractI18NTomcat6Mojo.tomcatHttStatusError", statusCode ) + ": " > + messagesProvider.getMessage( "AbstractI18NTomcat6Mojo.tomcatHttStatusError", statusCode, > + tomcatResponse.getReasonPhrase() ) + ": " > + tomcatResponse.getHttpResponseBody() ); > } > } > > Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java > URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java?rev=1519353&r1=1519352&r2=1519353&view=diff > ============================================================================== > --- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java (original) > +++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java Mon Sep 2 06:11:10 2013 > @@ -43,7 +43,7 @@ public abstract class AbstractTomcat7Moj > * The webapp context path to use for the web application being run. This must always start with a forward-slash > * ('/'). > */ > - @Parameter( defaultValue = "/${project.artifactId}", property = "maven.tomcat.path", required = true ) > + @Parameter(defaultValue = "/${project.artifactId}", property = "maven.tomcat.path", required = true) > protected String path; > > > @@ -56,7 +56,8 @@ public abstract class AbstractTomcat7Moj > * Check response of Tomcat to know if ok or not. > * > * @param tomcatResponse response of tomcat return by TomcatManager class > - * @throws org.apache.maven.plugin.MojoExecutionException if HTTP status code greater than 400 (included) > + * @throws org.apache.maven.plugin.MojoExecutionException > + * if HTTP status code greater than 400 (included) > */ > protected void checkTomcatResponse( TomcatManagerResponse tomcatResponse ) > throws MojoExecutionException > @@ -65,10 +66,12 @@ public abstract class AbstractTomcat7Moj > > if ( statusCode >= 400 ) > { > - getLog().error( messagesProvider.getMessage( "AbstractTomcat7Mojo.tomcatHttStatusError", statusCode ) ); > + getLog().error( messagesProvider.getMessage( "AbstractTomcat7Mojo.tomcatHttStatusError", statusCode, > + tomcatResponse.getReasonPhrase() ) ); > > throw new MojoExecutionException( > - messagesProvider.getMessage( "AbstractTomcat7Mojo.tomcatHttStatusError", statusCode ) + ": " > + messagesProvider.getMessage( "AbstractTomcat7Mojo.tomcatHttStatusError", statusCode, > + tomcatResponse.getReasonPhrase() ) + ": " > + tomcatResponse.getHttpResponseBody() ); > } > } > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org > For additional commands, e-mail: dev-help@tomcat.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org