Author: olamy
Date: Tue Sep 3 01:54:53 2013
New Revision: 1519539
URL: http://svn.apache.org/r1519539
Log:
unify error message key
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages.properties
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages_fr.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=1519539&r1=1519538&r2=1519539&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
Tue Sep 3 01:54:53 2013
@@ -106,10 +106,6 @@ UndeployMojo.undeployError = Cannot unde
ReloadMojo.reloadingApp = Reloading application at {0}
-# AbstractI18NTomcat6Mojo
+#
-AbstractI18NTomcat6Mojo.tomcatHttStatusError = Tomcat return http status
error: {0}
-
-#AbstractTomcat7Mojo
-
-AbstractTomcat7Mojo.tomcatHttStatusError = Tomcat return http status error:
{0}, Reason Phrase: {1}
+tomcatHttpStatusError = Tomcat return http status error: {0}, Reason Phrase:
{1}
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages_fr.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_fr.properties?rev=1519539&r1=1519538&r2=1519539&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages_fr.properties
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages_fr.properties
Tue Sep 3 01:54:53 2013
@@ -106,10 +106,4 @@ UndeployMojo.undeployError = N'a pas pu
ReloadMojo.reloadingApp = Rechargement de l'application sur {0}
-# AbstractI18NTomcat6Mojo
-
-AbstractI18NTomcat6Mojo.tomcatHttStatusError = Tomcat a retourn\u00E9 un code
HTTP en erreur: {0}
-
-#AbstractTomcat7Mojo
-
-AbstractTomcat7Mojo.tomcatHttStatusError = Tomcat a retourn\u00E9 un code HTTP
en erreur: {0}
\ No newline at end of file
+tomcatHttpStatusError = Tomcat a retourn\u00E9 un code HTTP en erreur: {0},
raison: {1}
\ No newline at end of file
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=1519539&r1=1519538&r2=1519539&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
Tue Sep 3 01:54:53 2013
@@ -68,11 +68,11 @@ public abstract class AbstractI18NTomcat
if ( statusCode >= 400 )
{
- getLog().error( messagesProvider.getMessage(
"AbstractI18NTomcat6Mojo.tomcatHttStatusError", statusCode,
+ getLog().error( messagesProvider.getMessage(
"tomcatHttpStatusError", statusCode,
tomcatResponse.getReasonPhrase() ) );
throw new MojoExecutionException(
- messagesProvider.getMessage(
"AbstractI18NTomcat6Mojo.tomcatHttStatusError", statusCode,
+ messagesProvider.getMessage( "tomcatHttpStatusError",
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=1519539&r1=1519538&r2=1519539&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
Tue Sep 3 01:54:53 2013
@@ -66,11 +66,11 @@ public abstract class AbstractTomcat7Moj
if ( statusCode >= 400 )
{
- getLog().error( messagesProvider.getMessage(
"AbstractTomcat7Mojo.tomcatHttStatusError", statusCode,
+ getLog().error( messagesProvider.getMessage(
"tomcatHttpStatusError", statusCode,
tomcatResponse.getReasonPhrase() ) );
throw new MojoExecutionException(
- messagesProvider.getMessage(
"AbstractTomcat7Mojo.tomcatHttStatusError", statusCode,
+ messagesProvider.getMessage( "tomcatHttpStatusError",
statusCode,
tomcatResponse.getReasonPhrase()
) + ": "
+ tomcatResponse.getHttpResponseBody() );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
