o in hindsight giving warnings instead of reading the user's mind can slow down ra

pid development. If install is called and already installed, try a reinstall. If s
tart is called and already started, try a restart. Do not give failures in these c
ases.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113432 13f79535-47bb-0310-9956-ffa450edef68

appserver/plugin.jelly

@@ -408,18 +408,11 @@ Maven has determined your <j:expr value="${maven.appserver.fullname}"/> appserve
         <appserver:install />
       </j:when>
       <j:otherwise>
-        <ant:echo message=" ">
- --------------------------------------------------------------------------
- | Plugin Warning                                                         |
- --------------------------------------------------------------------------
-
- Appserver already installed
-
- You may try
- o appserver:reinstall
-
- --------------------------------------------------------------------------
-        </ant:echo>
+        <log:warn trim="false">
+Appserver could not be installed because it is already installed. Trying to
+reinstall the appserver instead ...
+        </log:warn>
+        <appserver:reinstall />
       </j:otherwise>
     </j:choose>
 
@@ -438,18 +431,11 @@ Maven has determined your <j:expr value="${maven.appserver.fullname}"/> appserve
 
     <j:choose>
       <j:when test="${context.getVariable('maven.appserver.installed') != 'true'}">
-        <ant:echo message=" ">
- --------------------------------------------------------------------------
- | Plugin Warning                                                         |
- --------------------------------------------------------------------------
-
- Appserver not yet installed
-
- You may try
- o appserver:install
-
- --------------------------------------------------------------------------
-        </ant:echo>
+        <log:warn trim="false">
+Appserver could not be reinstalled because it is not yet installed. Trying to
+install the appserver instead ...
+        </log:warn>
+        <appserver:install />
       </j:when>
       <j:otherwise>
         <appserver:reinstall />
@@ -482,19 +468,11 @@ Maven has determined your <j:expr value="${maven.appserver.fullname}"/> appserve
         </ant:echo>
       </j:when>
       <j:when test="${context.getVariable('maven.appserver.started') == 'true'}">
-        <ant:echo message=" ">
- --------------------------------------------------------------------------
- | Plugin Warning                                                         |
- --------------------------------------------------------------------------
-
- Appserver already started
-
- You may try
- o appserver:restart
- o appserver:cycle
-
- --------------------------------------------------------------------------
-        </ant:echo>
+        <log:warn trim="false">
+Appserver could not be started because it is already started. Trying to restart
+the appserver instead ...
+        </log:warn>
+        <appserver:restart />
       </j:when>
       <j:when test="${context.getVariable('maven.appserver.installed') == 'true'}">
         <appserver:start />
@@ -518,19 +496,11 @@ Maven has determined your <j:expr value="${maven.appserver.fullname}"/> appserve
         <appserver:restart />
       </j:when>
       <j:otherwise>
-        <ant:echo message=" ">
- --------------------------------------------------------------------------
- | Plugin Warning                                                         |
- --------------------------------------------------------------------------
-
- Appserver not yet started
-
- You may try
- o appserver:start
- o appserver:cycle
-
- --------------------------------------------------------------------------
-        </ant:echo>
+        <log:warn trim="false">
+Appserver could not be restarted because it is not yet started. Trying to start
+the appserver ...
+        </log:warn>
+        <appserver:start />
       </j:otherwise>
     </j:choose>
   </goal>
@@ -547,9 +517,9 @@ Maven has determined your <j:expr value="${maven.appserver.fullname}"/> appserve
         <appserver:stop />
       </j:when>
       <j:otherwise>
-        <log:info trim="false">
-==> Appserver already stopped!
-        </log:info>
+        <log:warn trim="false">
+Appserver already stopped!
+        </log:warn>
       </j:otherwise>
     </j:choose>
   </goal>
@@ -576,9 +546,9 @@ Maven has determined your <j:expr value="${maven.appserver.fullname}"/> appserve
 
       <!-- already cleaned -->
       <j:otherwise>
-        <log:info trim="false">
-==> Appserver already cleaned!
-        </log:info>
+        <log:warn trim="false">
+Appserver already cleaned!
+        </log:warn>
       </j:otherwise>
 
     </j:choose>