o cleaning the log statements
o trying to work around how I think jexl should work but it seems to not. Time to look up touchstone git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@112786 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -78,7 +78,8 @@
|
||||
</j:choose>
|
||||
</j:set>
|
||||
|
||||
<log:info trim="false">Maven has determined your <j:expr value="${maven.webserver.fullname}"/> webserver instance is <j:expr value="${maven.webserver.installed.msg}"/> in directory [ <j:expr value="${maven.webserver.dir}"/> ] and <j:expr value="${maven.webserver.started.msg}"/> on <j:expr value="${maven.webserver.url}"/>
|
||||
<log:info trim="false">
|
||||
Maven has determined your <j:expr value="${maven.webserver.fullname}"/> webserver instance is <j:expr value="${maven.webserver.installed.msg}"/> in directory [ <j:expr value="${maven.webserver.dir}"/> ] and <j:expr value="${maven.webserver.started.msg}"/> on <j:expr value="${maven.webserver.url}"/>
|
||||
</log:info>
|
||||
|
||||
</goal>
|
||||
@@ -139,7 +140,7 @@
|
||||
description="Start or restart a webserver instance">
|
||||
|
||||
<!-- property to remember what goal the user first called -->
|
||||
<ant:property name="webserver:start.called" value="true" />
|
||||
<ant:property name="webserver.goal.start.called" value="true" />
|
||||
|
||||
<!-- must install before starting -->
|
||||
<j:if test="${!maven.webserver.installed}">
|
||||
@@ -189,17 +190,24 @@ Installing the <j:expr value="${maven.webserver.fullname}" /> webserver instance
|
||||
<!--==================================================================-->
|
||||
<goal name="webserver:stop" prereqs="webserver:init"
|
||||
description="Stop a webserver instance if started">
|
||||
<ant:condition property="maven.webserver.startandinstalled">
|
||||
<ant:and>
|
||||
<ant:isset property="maven.webserver.installed"/>
|
||||
<ant:isset property="maven.webserver.started"/>
|
||||
</ant:and>
|
||||
</ant:condition>
|
||||
|
||||
<j:choose>
|
||||
<j:when test="${maven.webserver.installed} and ${maven.webserver.started}">
|
||||
<attainGoal
|
||||
name="webserver:stop-${maven.webserver.fullname}" />
|
||||
<j:when test="${maven.webserver.startedandinstalled}">
|
||||
<log:info trim="false">
|
||||
Stopping the webserver...
|
||||
</log:info>
|
||||
<attainGoal name="webserver:stop-${maven.webserver.fullname}" />
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<j:if test="${!webserver-clean.called}">
|
||||
<log:info>
|
||||
The <j:expr value="${maven.webserver.fullname}"/>
|
||||
is already stopped!
|
||||
<j:if test="${webserver.goal.clean.called} == null">
|
||||
<log:info trim="false">
|
||||
The <j:expr value="${maven.webserver.fullname}"/> is already stopped!
|
||||
</log:info>
|
||||
</j:if>
|
||||
</j:otherwise>
|
||||
@@ -214,7 +222,7 @@ Installing the <j:expr value="${maven.webserver.fullname}" /> webserver instance
|
||||
description="Safely delete an installed webserver instance">
|
||||
|
||||
<!-- property to remember what goal the user first called -->
|
||||
<property name="webserver:clean.called" value="true" />
|
||||
<ant:property name="webserver.goal.clean.called" value="true" />
|
||||
|
||||
<j:if test="${maven.webserver.started}">
|
||||
<log:info>
|
||||
@@ -225,22 +233,21 @@ Installing the <j:expr value="${maven.webserver.fullname}" /> webserver instance
|
||||
</j:if>
|
||||
|
||||
<j:if test="${maven.webserver.installed}">
|
||||
<log:info>
|
||||
Deleting the <j:expr value="${maven.webserver.fullname}" />
|
||||
webserver instance ...
|
||||
<log:info trim="false">
|
||||
Deleting the <j:expr value="${maven.webserver.fullname}" /> webserver instance ...
|
||||
</log:info>
|
||||
|
||||
<!-- allow webservers to have their own cleanup -->
|
||||
<attainGoal name="webserver:clean-${maven.webserver.fullname}" />
|
||||
|
||||
<!-- by default cleanup the server dir -->
|
||||
<ant:delete dir="${maven.webserver.dir}"/>
|
||||
|
||||
</j:if>
|
||||
|
||||
<j:if test="${!maven.webserver.installed}">
|
||||
<log:info>
|
||||
The <j:expr value="${maven.webserver.fullname}"/>
|
||||
webserver instance is already cleaned!
|
||||
<j:if test="${maven.webserver.installed} != 'true'">
|
||||
<log:info trim="false">
|
||||
The <j:expr value="${maven.webserver.fullname}"/> webserver instance is already cleaned!
|
||||
</log:info>
|
||||
</j:if>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user