You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by pl...@apache.org on 2002/12/04 20:28:25 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/webserver apache-2.x.jelly
plynch 2002/12/04 11:28:24
Modified: src/plugins-build/webserver apache-2.x.jelly
Log:
o using the ant namespace where applicable
o adding a bit more code lying around
Revision Changes Path
1.6 +11 -10 jakarta-turbine-maven/src/plugins-build/webserver/apache-2.x.jelly
Index: apache-2.x.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/webserver/apache-2.x.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apache-2.x.jelly 30 Nov 2002 01:19:31 -0000 1.5
+++ apache-2.x.jelly 4 Dec 2002 19:28:24 -0000 1.6
@@ -1,21 +1,21 @@
<?xml version="1.0"?>
-<project xmlns:j="jelly:core" xmlns:log="jelly:log">
+<project xmlns:j="jelly:core" xmlns:log="jelly:log" xmlns:ant="jelly:ant">
<goal name="webserver:apache-2.x-reqs"
description="Intialize resources for apache processing">
<!-- Check if user has http.conf in a conf dir -->
- <available file="${maven.webserver.conf.dir}/conf/httpd.conf"
+ <ant:available file="${maven.webserver.conf.dir}/conf/httpd.conf"
type="file" property="maven.webserver.apache2x.has.conf"
value="true" />
- <fail unless="maven.webserver.apache2x.has.conf">
+ <ant:fail unless="maven.webserver.apache2x.has.conf">
To use this webserver, you must have a project specific
configuration file at the following location:
${maven.webserver.conf.dir}/conf/httpd.conf
- </fail>
+ </ant:fail>
</goal>
@@ -24,15 +24,16 @@
description="Install user files into apache installation">
<!-- Create common directories and copy configuration files -->
- <mkdir dir="${maven.webserver.dir}/logs"/>
- <mkdir dir="${maven.webserver.dir}/conf"/>
+ <ant:mkdir dir="${maven.webserver.dir}/logs"/>
+ <ant:mkdir dir="${maven.webserver.dir}/conf"/>
<!-- copy any user configuration files w/ filtering by forcing copy -->
<!-- expecting at least a httpd.conf -->
- <copy todir="${maven.webserver.dir}" overwrite="true">
- <fileset dir="${maven.webserver.conf.dir}" />
- <filterset refid="maven.webserver.filterset" />
- </copy>
+ <ant:copy todir="${maven.webserver.dir}" overwrite="true">
+ <ant:fileset dir="${maven.webserver.conf.dir}" />
+ <ant:filterset refid="maven.webserver.filterset.default" />
+ <ant:filterset refid="maven.webserver.filterset" />
+ </ant:copy>
</goal>