cvs commit: jakarta-turbine-maven/src/plugins-build/webserver plugin.jelly

[pl...@apache.org]

plynch      2002/12/04 11:30:12

  Modified:    src/plugins-build/webserver plugin.jelly
  Log:
  o using ant namespace
  o moving the default filterset into this file
  
  Revision  Changes    Path
  1.5       +31 -12    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- plugin.jelly	30 Nov 2002 01:19:31 -0000	1.4
  +++ plugin.jelly	4 Dec 2002 19:30:12 -0000	1.5
  @@ -3,7 +3,7 @@
   <!-- ================================================================== -->
   <!-- W E B S E R V E R  P L U G I N                                     -->
   <!-- ================================================================== -->
  -<project xmlns:j="jelly:core" xmlns:log="jelly:log">
  +<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:log="jelly:log">
   
     <!--==================================================================-->
     <!-- S U P P O R T E D  W E B S E R V E R S                           -->
  @@ -14,31 +14,51 @@
     <!-- B E G I N  C O R E  P R O C E S S I N G                          -->
     <!--==================================================================-->
     <!-- tell the user what Maven thinks about their webserver instance -->
  -  <goal name="webserver:init" 
  +  <goal name="webserver:init"
       description="Initialize resources needed for the plugin">
   
  -    <condition property="maven.webserver.started">
  -      <http url="${maven.webserver.url}" />
  -    </condition>
  +    <ant:condition property="maven.webserver.started">
  +      <ant:http url="${maven.webserver.url}" />
  +    </ant:condition>
   
  -    <available property="maven.webserver.installed"
  +    <ant:available property="maven.webserver.installed"
         file="${maven.webserver.dir}" type="dir" />
   
  +    <ant:filterset id="maven.webserver.filterset.default">
  +      <ant:filter token="maven.webserver.home" value="${maven.webserver.home}" />
  +      <ant:filter token="maven.webserver.name" value="${maven.webserver.name}" />
  +      <ant:filter token="maven.webserver.version" value="${maven.webserver.version}" />
  +      <ant:filter token="maven.webserver.port.http" value="${maven.webserver.port.http}" />
  +      <ant:filter token="maven.webserver.port.https" value="${maven.webserver.port.https}" />
  +      <ant:filter token="maven.webserver.port.one" value="${maven.webserver.port.one}" />
  +      <ant:filter token="maven.webserver.port.two" value="${maven.webserver.port.two}" />
  +      <ant:filter token="maven.webserver.port.three" value="${maven.webserver.port.three}" />
  +      <ant:filter token="maven.webserver.conf.dir" value="${maven.webserver.conf.dir}" />
  +      <ant:filter token="maven.webserver.host" value="${maven.webserver.host}" />
  +    </ant:filterset>
  +
  +    <ant:filterset id="maven.webserver.filterset">
  +      <ant:filter token="maven.webserver.NULLTOKEN" value="foobar" />
  +    </ant:filterset>
  +
       <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:when test="${maven.webserver.started}">started</j:when>
           <j:otherwise>not started</j:otherwise>
         </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}"/>
  +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>
   
     <!--==================================================================-->
  @@ -47,7 +67,7 @@
     <goal name="webserver:install" prereqs="webserver:init"
       description="Install or reinstall a webserver instance">
   
  -    <mkdir dir="${maven.webserver.dir}" />
  +    <ant:mkdir dir="${maven.webserver.dir}" />
   
       <j:choose>
         <!-- not installed - simply install -->
  @@ -86,8 +106,7 @@
     <!-- be custom implementations of reinstall                           -->
     <goal name="webserver:reinstall"
       prereqs="webserver:init, webserver:install-${maven.webserver.fullname}"
  -    description="Reinstall a web server" >
  -    <!-- <attainGoal name="webserver:install-${maven.webserver.fullname}" /> -->
  +    description="Reinstall a webserver instance" >
     </goal>
   
   
  @@ -188,7 +207,7 @@
           Deleting the <j:expr value="${maven.webserver.fullname}"/>
           webserver instance ..."/>
         </log:info>
  -      <delete dir="${maven.webserver.dir}"/>
  +      <ant:delete dir="${maven.webserver.dir}"/>
       </j:if>
   
       <j:if test="${!maven.webserver.installed}">