Fix error message (#498)

microsoft · Nov 15, 2018 · 8725fd9 · 8725fd9
1 parent 8802376
commit 8725fd9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/...n-plugin/src/main/java/com/microsoft/azure/maven/webapp/configuration/RuntimeSetting.java b/...n-plugin/src/main/java/com/microsoft/azure/maven/webapp/configuration/RuntimeSetting.java
@@ -53,8 +53,9 @@ public RuntimeStack getLinuxRuntime() throws MojoExecutionException {
                 case WILDFLY_14:
                     return RuntimeStack.WILDFLY_14_JRE8;
                 default:
-                    throw new MojoExecutionException(String.format(
-                        "Unknown value of <webContainer>. Supported values are %s, %s", TOMCAT_8_5, TOMCAT_9_0));
+                    throw new MojoExecutionException(
+                        String.format("Unknown value of <webContainer>. Supported values are %s, %s and %s.",
+                            TOMCAT_8_5, TOMCAT_9_0, WILDFLY_14));
             }
         }
         throw new MojoExecutionException(String.format(

diff --git a/...plugin/src/main/java/com/microsoft/azure/maven/webapp/handlers/ArtifactHandlerImplV2.java b/...plugin/src/main/java/com/microsoft/azure/maven/webapp/handlers/ArtifactHandlerImplV2.java
@@ -157,7 +157,7 @@ public void publishWarArtifact(final DeployTarget target, final File warArtifact
         final boolean deploySuccess = performActionWithRetry(executor, MAX_RETRY_TIMES, log);
         if (!deploySuccess) {
             throw new MojoExecutionException(
-                String.format("Failed to deploy war file after %d times of retry.", MAX_RETRY_TIMES + 1));
+                String.format("Failed to deploy war file after %d times of retry.", MAX_RETRY_TIMES));
         }
     }
 }
diff --git a/...lugin/src/main/java/com/microsoft/azure/maven/webapp/handlers/WarArtifactHandlerImpl.java b/...lugin/src/main/java/com/microsoft/azure/maven/webapp/handlers/WarArtifactHandlerImpl.java
@@ -88,7 +88,7 @@ public void publish(final DeployTarget target) throws MojoExecutionException {
             }
         }
 
-        throw new MojoExecutionException(String.format(DEPLOY_FAILURE, retryCount));
+        throw new MojoExecutionException(String.format(DEPLOY_FAILURE, DEFAULT_MAX_RETRY_TIMES));
     }
 
     protected String getContextPath() {
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            throw new MojoExecutionException(String.format(DEPLOY_FAILURE, retryCount));
+            throw new MojoExecutionException(String.format(DEPLOY_FAILURE, DEFAULT_MAX_RETRY_TIMES));
         }
         protected String getContextPath() {
@@ Expand Down @@