plynch 2002/07/07 22:22:01
Modified: src/plugins/webserver apache-2.x.jelly plugin.jelly
Log:
-import the apache 2.x external entity
-coreect the goals names to match the rest of maven
Revision Changes Path
1.2 +8 -3 jakarta-turbine-maven/src/plugins/webserver/apache-2.x.jelly
Index: apache-2.x.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/webserver/apache-2.x.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apache-2.x.jelly 7 Jul 2002 23:50:36 -0000 1.1
+++ apache-2.x.jelly 8 Jul 2002 05:22:01 -0000 1.2
@@ -1,8 +1,13 @@
-<?xml version="1.0"?>
+<!-- <?xml version="1.0"?> -->
<!-- needs work :-) -->
-<goal name="install-apache-2.x" />
+<goal name="install-apache-2.x" >
+</goal>
<goal name="start-apache-2.x" />
-<goal name="stop-apache-2.x" />
+<goal name="stop-apache-2.x">
+ <log:info>
+ Trying to stop an Apache 2.x instance.
+ </log:info>
+</goal>
1.2 +18 -17 jakarta-turbine-maven/src/plugins/webserver/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/webserver/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 7 Jul 2002 23:50:36 -0000 1.1
+++ plugin.jelly 8 Jul 2002 05:22:01 -0000 1.2
@@ -1,7 +1,8 @@
<?xml version="1.0"?>
-
-
+<!DOCTYPE project [
+ <!ENTITY apache-2.x SYSTEM "./src/plugins/webserver/apache-2.x.jelly">
+]>
<!-- ================================================================== -->
<!-- W E B S E R V E R P L U G I N -->
<!-- ================================================================== -->
@@ -12,7 +13,7 @@
<!-- S U P P O R T E D W E B S E R V E R S -->
<!--==================================================================-->
<!-- include the implmentation entities here -->
-
+ &apache-2.x;
<!--==================================================================-->
<!-- B E G I N C O R E P R O C E S S I N G -->
@@ -25,7 +26,7 @@
method="execute" />
</define:taglib>
<server:server-started-check propertyName="maven.webserver.started"
- URL="http://www.appiant.com"/>
+ URL="${maven.webserver.url}"/>
<!-- BOB -->
@@ -67,7 +68,7 @@
<!--==================================================================-->
<!-- I S T A L L -->
<!--==================================================================-->
- <goal name="maven:webserver-install"
+ <goal name="webserver:install"
description="Install a webserver instance.">
<j:choose>
@@ -83,9 +84,9 @@
<!-- installed and started -->
<j:when test="${maven.webserver.installed} and ${!maven.webserver.started}">
<attain>
- <attainGoal name="maven:webserver-stop" />
- <attainGoal name="maven:webserver-reinstall" />
- <attainGoal name="maven:webserver-start" />
+ <attainGoal name="webserver:stop" />
+ <attainGoal name="webserver:reinstall" />
+ <attainGoal name="webserver:start" />
</attain>
</j:when>
<!-- one of those 'things' that should never happen -->
@@ -105,13 +106,13 @@
<!--==================================================================-->
<!-- the purpose of this target is to allow the user to be very -->
<!-- when using pre and post goals -->
- <goal name="maven:webserver-reinstall"
+ <goal name="webserver:reinstall"
prereqs="install-${maven.webserver.fullname}" />
<!--==================================================================-->
<!-- S T O P -->
<!--==================================================================-->
- <goal name="webserver-stop" description="Stop a started webserver">
+ <goal name="webserver:stop" description="Stop a started webserver">
<j:choose>
<j:when test="${maven.webserver.installed} and ${maven.webserver.started}">
@@ -134,7 +135,7 @@
<!--==================================================================-->
<!-- S T A R T -->
<!--==================================================================-->
- <goal name="webserver-start"
+ <goal name="webserver:start"
description="Start a webserver instance">
<!-- property to remember what goal the user first called -->
@@ -146,18 +147,18 @@
Installing the <j:expr value="${maven.webserver.fullname}"/>
webserver instance before starting it..."/>
</log:info>
- <attainGoal name="webserver-install" />
+ <attainGoal name="webserver:install" />
</j:if>
<j:choose>
<j:when test="${maven.webserver.started}">
<attain>
- <attainGoal name="maven:webserver-stop" />
+ <attainGoal name="webserver:stop" />
<log:info>
Restarting the <j:expr value="${maven.webserver.fullname}"/>
webserver instance ..."/>
</log:info>
- <attainGoal name="maven:webserver-restart" />
+ <attainGoal name="webserver:restart" />
</attain>
</j:when>
<j:when test="${!maven.webserver.installed}">
@@ -165,7 +166,7 @@
Installing the <j:expr value="${maven.webserver.fullname}"/>
webserver instance before starting it ..."/>
</log:info>
- <attainGoal name="maven:webserver-install" />
+ <attainGoal name="webserver:install" />
<attainGoal name="start-${maven.webserver.fullname}"/>
</j:when>
</j:choose>
@@ -177,14 +178,14 @@
<!--==================================================================-->
<!-- the purpose of this target is to allow the user to be very -->
<!-- when using pre and post goals -->
- <goal name="maven:webserver-restart"
+ <goal name="webserver:restart"
prereqs="start-${maven.webserver.name}-${maven-webserver.version}" />
<!--==================================================================-->
<!-- C L E A N -->
<!--==================================================================-->
- <goal name="webserver-clean"
+ <goal name="webserver:clean"
description="Safely delete a webserver instance install">
<j:if test="${maven.webserver.started}">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
