From fe9fa51601ae8422b69ecc7b8c05a92090065161 Mon Sep 17 00:00:00 2001
From: plynch <plynch@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 30 Jan 2003 22:06:28 +0000
Subject: [PATCH] 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
---
 webserver/plugin.jelly                          |  6 +-----
 webserver/plugin.properties                     | 11 -----------
 webserver/src/plugin-resources/apache-2.x.jelly |  1 -
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/webserver/plugin.jelly b/webserver/plugin.jelly
index d6139ed3..34aa5a06 100644
--- a/webserver/plugin.jelly
+++ b/webserver/plugin.jelly
@@ -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}">
diff --git a/webserver/plugin.properties b/webserver/plugin.properties
index cb5f242b..81c6a67f 100644
--- a/webserver/plugin.properties
+++ b/webserver/plugin.properties
@@ -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
 #
diff --git a/webserver/src/plugin-resources/apache-2.x.jelly b/webserver/src/plugin-resources/apache-2.x.jelly
index abad4fbf..1d82985f 100644
--- a/webserver/src/plugin-resources/apache-2.x.jelly
+++ b/webserver/src/plugin-resources/apache-2.x.jelly
@@ -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')}">