plynch 2002/07/18 18:07:40
Modified: src/plugins-build/webserver plugin.jelly plugin.properties
Log:
o Fixing all the goal names to match the current standard and a few were broken.
o moving the maven.webserver.fullname to the properties file as it can be derived
from maven.webserver.name and maven.webserver.version there
o adding webserver:init goal that is a prereq for each goal
getting there...
Revision Changes Path
1.2 +54 -46 jakarta-turbine-maven/src/plugins-build/webserver/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/webserver/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 14 Jul 2002 19:09:32 -0000 1.1
+++ plugin.jelly 19 Jul 2002 01:07:40 -0000 1.2
@@ -14,54 +14,56 @@
<!--==================================================================-->
<!-- B E G I N C O R E P R O C E S S I N G -->
<!--==================================================================-->
- <define:taglib uri="serverLib">
- <define:jellybean name="server-started-check"
- className="org.apache.maven.jelly.tags.ServerStartedCheckTag" />
- </define:taglib>
- <server:server-started-check propertyName="maven.webserver.started"
- URL="${maven.webserver.url}"/>
-
- <available property="maven.webserver.installed"
- file="${maven.webserver.dir}" type="dir" />
-
- <j:set var="maven.webserver.fullname"
- value="${maven.webserver.name}-${maven.webserver.version}" />
-
<!-- tell the user what Maven thinks about their webserver instance -->
- <log:info>
- <j:set var="maven.webserver.installed.msg">
- <j:choose>
- <j:when test="${maven.webserver.installed}">installed</j:when>
- <j:otherwise>not installed</j:otherwise>
- </j:choose>
- </j:set>
- <j:set var="maven.webserver.started.msg">
- <j:choose>
- <j:when test="${maven.webserver.installed}">started</j:when>
- <j:otherwise>not started</j:otherwise>
- </j:choose>
- </j:set>
- 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 name="webserver:init">
+ <define:taglib uri="serverLib">
+ <define:jellybean name="server-started-check"
+ className="org.apache.maven.jelly.tags.ServerStartedCheckTag" />
+ </define:taglib>
+ <server:server-started-check propertyName="maven.webserver.started"
+ URL="${maven.webserver.url}"/>
+
+ <available property="maven.webserver.installed"
+ file="${maven.webserver.dir}" type="dir" />
+
+<!-- <j:set var="maven.webserver.fullname"
+ value="${maven.webserver.name}-${maven.webserver.version}" />
+-->
+ <log:info>
+ <j:set var="maven.webserver.installed.msg">
+ <j:choose>
+ <j:when test="${maven.webserver.installed}">installed</j:when>
+ <j:otherwise>not installed</j:otherwise>
+ </j:choose>
+ </j:set>
+ <j:set var="maven.webserver.started.msg">
+ <j:choose>
+ <j:when test="${maven.webserver.installed}">started</j:when>
+ <j:otherwise>not started</j:otherwise>
+ </j:choose>
+ </j:set>
+ 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>
<!--==================================================================-->
<!-- I S T A L L -->
<!--==================================================================-->
- <goal name="webserver:install"
+ <goal name="webserver:install" prereqs="webserver:init"
description="Install or reinstall a webserver instance">
<j:choose>
<!-- not installed - simply install -->
<j:when test="${!maven.webserver.installed}">
- <attainGoal name="install-${maven.webserver.fullname}" />
+ <attainGoal name="webserver:install-${maven.webserver.fullname}" />
</j:when>
<!-- installed and stopped -->
<j:when
test="${maven.webserver.installed} and ${!maven.webserver.started}">
- <attainGoal name="maven:webserver-reinstall" />
+ <attainGoal name="webserver:reinstall" />
</j:when>
<!-- installed and started -->
<j:when test="${maven.webserver.installed} and ${!maven.webserver.started}">
@@ -89,16 +91,19 @@
<!-- specific when using pre and post goals and sometimes there may -->
<!-- be custom implementations of reinstall -->
<goal name="webserver:reinstall"
- prereqs="install-${maven.webserver.fullname}" />
+ prereqs="webserver:init, webserver:install-${maven.webserver.fullname}" >
+ <!-- <attainGoal name="webserver:install-${maven.webserver.fullname}" /> -->
+ </goal>
+
<!--==================================================================-->
<!-- S T A R T -->
<!--==================================================================-->
- <goal name="webserver:start"
+ <goal name="webserver:start" prereqs="webserver:init"
description="Start or restart a webserver instance">
<!-- property to remember what goal the user first called -->
- <property name="webserver-start.called" value="true" />
+ <property name="webserver:start.called" value="true" />
<!-- must install before starting -->
<j:if test="${!maven.webserver.installed}">
@@ -126,7 +131,7 @@
webserver instance before starting it ..."/>
</log:info>
<attainGoal name="webserver:install" />
- <attainGoal name="start-${maven.webserver.fullname}"/>
+ <attainGoal name="webserver:start-${maven.webserver.fullname}"/>
</j:when>
</j:choose>
@@ -136,19 +141,22 @@
<!-- R E S T A R T -->
<!--==================================================================-->
<!-- the purpose of this target is to allow the user to be very -->
- <!-- when using pre and post goals -->
+ <!-- specific when using pre and post goals -->
<goal name="webserver:restart"
- prereqs="start-${maven.webserver.fullname}" />
+ prereqs="webserver:init,webserver:restart-${maven.webserver.fullname}">
+ <!-- <attainGoal name="start-${maven.webserver.fullname}" />-->
+ </goal>
<!--==================================================================-->
<!-- S T O P -->
<!--==================================================================-->
- <goal name="webserver:stop" description="Stop a webserver instance if started">
+ <goal name="webserver:stop" prereqs="webserver:init"
+ description="Stop a webserver instance if started">
<j:choose>
<j:when test="${maven.webserver.installed} and ${maven.webserver.started}">
<attainGoal
- name="stop-${maven.webserver.fullname}" />
+ name="webserver:stop-${maven.webserver.fullname}" />
</j:when>
<j:otherwise>
<j:if test="${!webserver-clean.called}">
@@ -165,18 +173,18 @@
<!--==================================================================-->
<!-- C L E A N -->
<!--==================================================================-->
- <goal name="webserver:clean"
+ <goal name="webserver:clean" prereqs="webserver:init"
description="Safely delete an installed webserver instance">
<!-- property to remember what goal the user first called -->
- <property name="webserver-clean.called" value="true" />
+ <property name="webserver:clean.called" value="true" />
<j:if test="${maven.webserver.started}">
<log:info>
Stopping the <j:expr value="${maven.webserver.fullname}"/>
webserver instance before deleting it..."/>
</log:info>
- <attainGoal name="webserver-stop" />
+ <attainGoal name="webserver:stop" />
</j:if>
<j:if test="${maven.webserver.installed}">
1.2 +3 -0
jakarta-turbine-maven/src/plugins-build/webserver/plugin.properties
Index: plugin.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/plugins-build/webserver/plugin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.properties 14 Jul 2002 19:09:32 -0000 1.1
+++ plugin.properties 19 Jul 2002 01:07:40 -0000 1.2
@@ -17,6 +17,9 @@
#
maven.webserver.version=2.x
+# needed for dir searches and messages
+maven.webserver.fullname=${maven.webserver.name}-${maven.webserver.version}
+
#
# ports to access this server instance
#
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
