From 48510ac284ff50bac12db57d0c6aa25ecf6012a6 Mon Sep 17 00:00:00 2001 From: brett Date: Sun, 25 Apr 2004 02:12:15 +0000 Subject: [PATCH] PR: MPWEBSERVER-1 add user/group git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115040 13f79535-47bb-0310-9956-ffa450edef68 --- webserver/plugin.jelly | 6 +++++- webserver/plugin.properties | 7 +++++++ webserver/project.xml | 2 +- webserver/xdocs/changes.xml | 32 ++++++++++++++++++++++++++++++++ webserver/xdocs/properties.xml | 18 +++++++++++++++++- 5 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 webserver/xdocs/changes.xml diff --git a/webserver/plugin.jelly b/webserver/plugin.jelly index 79be13f6..37df2cf0 100644 --- a/webserver/plugin.jelly +++ b/webserver/plugin.jelly @@ -241,6 +241,10 @@ value="${context.getVariable('maven.webserver.dir.path')}" /> + + - \ No newline at end of file + diff --git a/webserver/plugin.properties b/webserver/plugin.properties index 22ab1e6e..1ac9936d 100644 --- a/webserver/plugin.properties +++ b/webserver/plugin.properties @@ -103,3 +103,10 @@ maven.webserver.fullname=${maven.webserver.name}-${maven.webserver.version} maven.webserver.conf.dir=${maven.conf.dir}/webserver/${maven.webserver.fullname} +#-------------------------------------------------------# +# OPTIONNAL PROPERTIES RESOLVING TOKENS IN HTTPD.CONF # +#-------------------------------------------------------# +# The user and group to run httpd as +maven.webserver.user=apache +maven.webserver.group=apache + diff --git a/webserver/project.xml b/webserver/project.xml index b63351c2..879f8ef5 100644 --- a/webserver/project.xml +++ b/webserver/project.xml @@ -23,7 +23,7 @@ 3 maven-webserver-plugin Maven Webserver Plugin - 2.0 + 2.1-SNAPSHOT Manage web servers http://maven.apache.org/reference/plugins/webserver/ diff --git a/webserver/xdocs/changes.xml b/webserver/xdocs/changes.xml new file mode 100644 index 00000000..498291bb --- /dev/null +++ b/webserver/xdocs/changes.xml @@ -0,0 +1,32 @@ + + + + + + + Changes + dIon Gillard + + + + Add user and group properties + + + + diff --git a/webserver/xdocs/properties.xml b/webserver/xdocs/properties.xml index d9885d27..a629158c 100644 --- a/webserver/xdocs/properties.xml +++ b/webserver/xdocs/properties.xml @@ -150,6 +150,22 @@ would like your server instance to serve files from.

+ + maven.webserver.user + Yes + +

Default value is apache.

+

This is the user that Apache should run as.

+ + + + maven.webserver.group + Yes + +

Default value is apache.

+

This is the group that Apache should run as.

+ + @@ -186,4 +202,4 @@ - \ No newline at end of file +