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

[pl...@apache.org]

plynch      2003/01/23 12:30:11

  Modified:    src/plugins-build/webserver plugin.jelly
  Log:
  o improved logging
  o improved filters for goals that copy
  o added ability for each webserver to have a clean target
  
  Revision  Changes    Path
  1.7       +26 -10    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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- plugin.jelly	13 Dec 2002 19:07:25 -0000	1.6
  +++ plugin.jelly	23 Jan 2003 20:30:11 -0000	1.7
  @@ -17,15 +17,28 @@
     <goal name="webserver:init"
       description="Initialize resources needed for the plugin">
   
  +    <!-- a flag to see if the webserver is started -->
       <ant:condition property="maven.webserver.started">
         <ant:http url="${maven.webserver.url}" />
       </ant:condition>
   
  +    <!-- a flag to see if the webserver is installed -->
       <ant:available property="maven.webserver.installed"
  -      file="${maven.webserver.dir}" type="dir" />
  +      file="${maven.webserver.root}" type="dir" />
   
  +    <!-- convert all path related properties to their os equivalent -->
  +    <ant:property name="maven.webserver.home.path"
  +      location="${maven.webserver.home}" />
  +    <ant:property name="maven.webserver.conf.dir.path"
  +      location="${maven.webserver.conf.dir}" />
  +    <ant:property name="maven.webserver.root.path"
  +      location="${maven.webserver.root}" />
  +    <ant:property name="maven.webserver.dir.path"
  +      location="${maven.webserver.dir}" />
  +
  +    <!-- create the filterset to be available to copy tasks that want it -->
       <ant:filterset id="maven.webserver.filterset.default">
  -      <ant:filter token="maven.webserver.home" value="${maven.webserver.home}" />
  +      <ant:filter token="maven.webserver.home" value="${maven.webserver.home.path}" />
         <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}" />
  @@ -33,10 +46,10 @@
         <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.conf.dir" value="${maven.webserver.conf.dir.path}" />
         <ant:filter token="maven.webserver.host" value="${maven.webserver.host}" />
  -      <!-- FIXME - should be moved to a webapp plugin -->
  -      <ant:filter token="maven.webapp.dir" value="${maven.webapp.dir}" />
  +      <ant:filter token="maven.webserver.dir" value="${maven.webserver.dir.path}" />
  +      <ant:filter token="maven.webserver.root" value="${maven.webserver.root.path}" />
       </ant:filterset>
   
       <ant:filterset id="maven.webserver.filterset">
  @@ -57,8 +70,7 @@
         </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>
  @@ -123,9 +135,8 @@
   
       <!-- must install before starting -->
       <j:if test="${!maven.webserver.installed}">
  -      <log:info>
  -        Installing the <j:expr value="${maven.webserver.fullname}"/>
  -        webserver instance before starting it..."/>
  +      <log:info trim="false">
  +Installing the <j:expr value="${maven.webserver.fullname}"/> webserver instance before starting it...
         </log:info>
         <attainGoal name="webserver:install" />
       </j:if>
  @@ -209,7 +220,12 @@
           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}">