diff --git a/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages.properties b/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages.properties index da29fb97..2cadf6e4 100644 --- a/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages.properties +++ b/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages.properties @@ -109,3 +109,5 @@ ReloadMojo.reloadingApp = Reloading application at {0} # tomcatHttpStatusError = Tomcat return http status error: {0}, Reason Phrase: {1} +tomcatHttpDeployBodyError = FAIL +tomcatHttpBodyError = Tomcat return http body error: {0} diff --git a/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages_fr.properties b/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages_fr.properties index f180d09c..a44dc8c7 100644 --- a/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages_fr.properties +++ b/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages_fr.properties @@ -106,4 +106,6 @@ UndeployMojo.undeployError = N'a pas pu retirer l'application : {0} ReloadMojo.reloadingApp = Rechargement de l'application sur {0} -tomcatHttpStatusError = Tomcat a retourn\u00E9 un code HTTP en erreur: {0}, raison: {1} \ No newline at end of file +tomcatHttpStatusError = Tomcat a retourn\u00E9 un code HTTP en erreur : {0}, raison : {1} +tomcatHttpDeployBodyError = ECHEC +tomcatHttpBodyError = Tomcat a retourn\u00E9 un corps HTTP en erreur : {0} \ No newline at end of file diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java index f53eb16c..8bc04182 100644 --- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java +++ b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java @@ -79,6 +79,14 @@ protected void checkTomcatResponse( TomcatManagerResponse tomcatResponse ) messagesProvider.getMessage( "tomcatHttpStatusError", statusCode, tomcatResponse.getReasonPhrase() ) + ": " + tomcatResponse.getHttpResponseBody() ); - } + } else if(tomcatResponse.getHttpResponseBody().startsWith(messagesProvider.getMessage("tomcatHttpDeployBodyError"))) { + { + getLog().error( messagesProvider.getMessage( "tomcatHttpBodyError", + tomcatResponse.getHttpResponseBody() ) ); + throw new MojoExecutionException( + messagesProvider.getMessage( "tomcatHttpBodyError", + tomcatResponse.getHttpResponseBody() )); + } } } +} diff --git a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java index ed4ff246..a9660503 100644 --- a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java +++ b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java @@ -77,6 +77,14 @@ protected void checkTomcatResponse( TomcatManagerResponse tomcatResponse ) messagesProvider.getMessage( "tomcatHttpStatusError", statusCode, tomcatResponse.getReasonPhrase() ) + ": " + tomcatResponse.getHttpResponseBody() ); + } else if(tomcatResponse.getHttpResponseBody().startsWith(messagesProvider.getMessage("tomcatHttpDeployBodyError"))) { + { + getLog().error( messagesProvider.getMessage( "tomcatHttpBodyError", + tomcatResponse.getHttpResponseBody() ) ); + throw new MojoExecutionException( + messagesProvider.getMessage( "tomcatHttpBodyError", + tomcatResponse.getHttpResponseBody() )); + } } } } diff --git a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java index 74126fb1..e751703f 100644 --- a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java +++ b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java @@ -77,6 +77,14 @@ protected void checkTomcatResponse( TomcatManagerResponse tomcatResponse ) messagesProvider.getMessage( "tomcatHttpStatusError", statusCode, tomcatResponse.getReasonPhrase() ) + ": " + tomcatResponse.getHttpResponseBody() ); - } + } else if(tomcatResponse.getHttpResponseBody().startsWith(messagesProvider.getMessage("tomcatHttpDeployBodyError"))) { + { + getLog().error( messagesProvider.getMessage( "tomcatHttpBodyError", + tomcatResponse.getHttpResponseBody() ) ); + throw new MojoExecutionException( + messagesProvider.getMessage( "tomcatHttpBodyError", + tomcatResponse.getHttpResponseBody() )); + } } } +}