brett 2004/04/24 19:12:15
Modified: webserver plugin.jelly plugin.properties project.xml
webserver/xdocs properties.xml
Added: webserver/xdocs changes.xml
Log:
PR: MPWEBSERVER-1
add user/group
Revision Changes Path
1.21 +5 -1 maven-plugins/webserver/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/webserver/plugin.jelly,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plugin.jelly 4 Mar 2004 18:39:37 -0000 1.20
+++ plugin.jelly 25 Apr 2004 02:12:15 -0000 1.21
@@ -241,6 +241,10 @@
value="${context.getVariable('maven.webserver.dir.path')}" />
<ant:filter token="maven.webserver.root"
value="${context.getVariable('maven.webserver.root.path')}" />
+ <ant:filter token="maven.webserver.user"
+ value="${context.getVariable('maven.webserver.user')}" />
+ <ant:filter token="maven.webserver.group"
+ value="${context.getVariable('maven.webserver.group')}" />
<!-- allow integration with the properties of the appserver plugin -->
<ant:filter token="maven.appserver.home"
@@ -609,4 +613,4 @@
</j:choose>
</goal>
-</project>
\ No newline at end of file
+</project>
1.8 +7 -0 maven-plugins/webserver/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/webserver/plugin.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.properties 4 Mar 2004 18:39:37 -0000 1.7
+++ plugin.properties 25 Apr 2004 02:12:15 -0000 1.8
@@ -103,3 +103,10 @@
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
+
1.24 +1 -1 maven-plugins/webserver/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/webserver/project.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- project.xml 7 Mar 2004 00:20:24 -0000 1.23
+++ project.xml 25 Apr 2004 02:12:15 -0000 1.24
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-webserver-plugin</id>
<name>Maven Webserver Plugin</name>
- <currentVersion>2.0</currentVersion>
+ <currentVersion>2.1-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Manage web servers</shortDescription>
<url>http://maven.apache.org/reference/plugins/webserver/</url>
1.5 +17 -1 maven-plugins/webserver/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/webserver/xdocs/properties.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- properties.xml 4 Mar 2004 18:39:38 -0000 1.4
+++ properties.xml 25 Apr 2004 02:12:15 -0000 1.5
@@ -150,6 +150,22 @@
would like your server instance to serve files from.</p>
</td>
</tr>
+ <tr>
+ <td>maven.webserver.user</td>
+ <td>Yes</td>
+ <td>
+ <p>Default value is <code>apache</code>.</p>
+ <p>This is the user that Apache should run as.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>maven.webserver.group</td>
+ <td>Yes</td>
+ <td>
+ <p>Default value is <code>apache</code>.</p>
+ <p>This is the group that Apache should run as.</p>
+ </td>
+ </tr>
<!-- test related -->
@@ -186,4 +202,4 @@
</table>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
1.1 maven-plugins/webserver/xdocs/changes.xml
Index: changes.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<document>
<properties>
<title>Changes</title>
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
</properties>
<body>
<release version="2.1-SNAPSHOT" date="in CVS">
<action dev="brett" type="add" issue="MPWEBSERVER-1" due-to="Guillaume
Lasnier">Add user and group properties</action>
</release>
<release version="2.0" date="2004-03-07"></release>
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
