diff --git a/appserver/plugin.properties b/appserver/plugin.properties
index 911a5aa1..3dd8abd6 100644
--- a/appserver/plugin.properties
+++ b/appserver/plugin.properties
@@ -1,135 +1,89 @@
-#############################################################################
+############################################################################
 # W E B S E R V E R
-#----------------------------------------------------------------------------
+#---------------------------------------------------------------------------
+
+#-------------------------------------------------------#
+# OPTIONAL PROPERTIES TO BE SET BY PLUGIN CONSUMER      #
+#-------------------------------------------------------#
 
 #
-# the place where the root install of the app server resides
-#
-maven.appserver.home=/apps/apache2
-
-#
-# a supported name of an application server instance to install
-#
-maven.appserver.name=apache
-
-#
-# version number of the application server
-#
-maven.appserver.version=2.x
-
-# needed for dir searches and messages
-maven.appserver.fullname=${maven.appserver.name}-${maven.appserver.version}
-
-#
-# ports to access this server instance
+# ports to access and configure this server instance
 #
 maven.appserver.port.http=80
 maven.appserver.port.https=443
-maven.appserver.port.one=8090
-maven.appserver.port.two=8091
-maven.appserver.port.three=8092
 
 #
-# where to install the local instance of the server
+# optional ports for other work
 #
-maven.appserver.dir=${basedir}/server
-
-#
-# where to look for the instance specific files for this appserver
-#
-maven.appserver.conf.dir=${maven.conf.dir}/appserver/${maven.appserver.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.appserver.classpath=${java.class.path}
-# paths can be absolute or relative to ${maven.appserver.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.appserver.classpath=
+# maven.appserver.port.A=
+# maven.appserver.port.B=
+# maven.appserver.port.C=
 
 #
 # The host name, used when configuring, defaults to localhost
 #
 maven.appserver.host=localhost
 
-#
-# The URL used to test the current running status of the appserver
-#
-maven.appserver.url=http://${maven.appserver.host}:${maven.appserver.port.http}/index.html
-
-#
-# The root directory out of which you will server will serve your documents
-#
-maven.appserver.root=${maven.appserver.dir}/webapps/ROOT
+#-------------------------------------------------------#
 
 
-#############################################################################
-############################## L E G A C Y ##################################
-# ---> These properties pasted here from the J2EE plugin implementation
-# ---> They should be culled
-#############################################################################
-# A P P S E R V E R
-#----------------------------------------------------------------------------
-
-#
-# used to let the appserver implementation scripts know which version of j2ee we are
-# running against
-#
-# maven.j2ee.version=13
-
-#
-# the place where the main install of the application server resides
-#
-#maven.appserver.home=/apps/jakarta-tomcat-4
+#-------------------------------------------------------#
+# REQUIRED PROPERTIES THAT MAY/MUST BE SET BY USER      #
+#-------------------------------------------------------#
 
 #
 # a supported name of an application server instance to install
 #
-#maven.appserver.name=tomcat
+# maven.appserver.name=tomcat
 
 #
-# version number of the application server, in the form of ##
+# version number of the application server
 #
-#maven.appserver.version=4.x
-
-## needed for dir names and messages to the user
-#maven.appserver.fullname=${maven.appserver.name}-${maven.appserver.version}
+# maven.appserver.version=4.x
 
 #
-# ports to access this server instance
+# The place where the binary machine install of the web server resides
 #
-#maven.appserver.port.http=8082
-#maven.appserver.port.https=8083
-#maven.appserver.port.one=8087
-#maven.appserver.port.two=8088
-#maven.appserver.port.three=8089
+# maven.appserver.home=/apps/apache2
 
 #
-# where to install the local instance of the server
+# The directory to install the local instance of the server
 #
-#maven.appserver.dir=${basedir}/server
+maven.appserver.dir=${basedir}/server
 
 #
-# 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.appserver.classpath=${java.class.path}
-# paths can be absolute or relative to ${maven.appserver.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
+# The default port to test for a TCP/IP connection listener for determining if
+# the appserver instance is started. Default is the same as the http port
 #
-#maven.appserver.classpath=
-
-#
-# The host name, used when configuring, defaults to localhost
-#
-#maven.appserver.host=localhost
+maven.appserver.test.socket=${maven.appserver.port.http}
 
 #
 # The URL used to test the current running status of the appserver
+# Default is left as null, so that only the socket is used to test if the server
+# is started
 #
-#maven.appserver.url=http://${maven.appserver.host}:${maven.appserver.port.http}/index.html
+# maven.appserver.test.url=http://${maven.appserver.host}:${maven.appserver.port.http}/index.html
+
+#
+# The root directory out of which you will server will serve your documents
+# The default is under webapps, to allow this appserver to play friendly
+# with a Tomcat application container by default
+#
+maven.appserver.root=${maven.appserver.dir}/webapps/ROOT
+
+#-------------------------------------------------------#
+
+
+#-------------------------------------------------------#
+# REQUIRED PROPERTIES NOT NORMALLY MODIFIED BY USERS    #
+#-------------------------------------------------------#
+
+# needed for dir searches and messages, should NOT be changed by user
+maven.appserver.fullname=${maven.appserver.name}-${maven.appserver.version}
+
+#
+# where to look for the instance specific config files for this appserver
+#
+maven.appserver.conf.dir=${maven.conf.dir}/appserver/${maven.appserver.fullname}
+