o removing unused property and filterset
There is no need to have a user filterset as the user can just use the ant replace task to do that work instead of copy. git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@112783 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -64,10 +64,6 @@
|
||||
value="${maven.webserver.root.path}" />
|
||||
</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>
|
||||
@@ -143,7 +139,7 @@
|
||||
description="Start or restart a webserver instance">
|
||||
|
||||
<!-- property to remember what goal the user first called -->
|
||||
<property name="webserver:start.called" value="true" />
|
||||
<ant:property name="webserver:start.called" value="true" />
|
||||
|
||||
<!-- must install before starting -->
|
||||
<j:if test="${!maven.webserver.installed}">
|
||||
|
||||
@@ -39,17 +39,6 @@ maven.webserver.dir=${basedir}/server
|
||||
#
|
||||
maven.webserver.conf.dir=${maven.conf.dir}/webserver/${maven.webserver.fullname}
|
||||
|
||||
#
|
||||
# files in an 'includes' pattern to include when controlling the server
|
||||
# For example, if you have classes in your classpath you would like to
|
||||
# include when starting the server, you could use
|
||||
# maven.webserver.classpath=${java.class.path}
|
||||
# paths can be absolute or relative to ${maven.webserver.dir} as that is
|
||||
# where a jvm will be started. This is common for libraries that need sharing
|
||||
# across all webapps installed in the server
|
||||
#
|
||||
maven.webserver.classpath=
|
||||
|
||||
#
|
||||
# The host name, used when configuring, defaults to localhost
|
||||
#
|
||||
|
||||
@@ -42,7 +42,6 @@ ${maven.webserver.conf.dir}/conf/httpd.conf
|
||||
<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>
|
||||
|
||||
<j:if test="${systemScope['os.name'].startsWith('Windows')}">
|
||||
|
||||
Reference in New Issue
Block a user