diff --git a/webserver/plugin.properties b/webserver/plugin.properties
index 81c6a67f..1d6ee200 100644
--- a/webserver/plugin.properties
+++ b/webserver/plugin.properties
@@ -1,56 +1,85 @@
-#############################################################################
+############################################################################
 # 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 web server resides
-#
-maven.webserver.home=/apps/apache2
-
-#
-# a supported name of an application server instance to install
-#
-maven.webserver.name=apache
-
-#
-# version number of the application server
-#
-maven.webserver.version=2.x
-
-# needed for dir searches and messages
-maven.webserver.fullname=${maven.webserver.name}-${maven.webserver.version}
-
-#
-# ports to access this server instance
+# ports to access and configure this server instance
 #
 maven.webserver.port.http=80
 maven.webserver.port.https=443
-maven.webserver.port.one=8090
-maven.webserver.port.two=8091
-maven.webserver.port.three=8092
 
-#
-# where to install the local instance of the server
-#
-maven.webserver.dir=${basedir}/server
-
-#
-# where to look for the instance specific files for this webserver
-#
-maven.webserver.conf.dir=${maven.conf.dir}/webserver/${maven.webserver.fullname}
+# maven.webserver.port.one=8090
+# maven.webserver.port.two=8091
+# maven.webserver.port.three=8092
 
 #
 # The host name, used when configuring, defaults to localhost
 #
 maven.webserver.host=localhost
 
+#-------------------------------------------------------#
+
+
+#-------------------------------------------------------#
+# REQUIRED PROPERTIES THAT MAY/MUST BE SET BY USER      #
+#-------------------------------------------------------#
+
+#
+# a supported name of an application server instance to install
+#
+# maven.webserver.name=apache
+
+#
+# version number of the application server
+#
+# maven.webserver.version=2.x
+
+#
+# The place where the binary machine install of the web server resides
+#
+# maven.webserver.home=/apps/apache2
+
+#
+# The directory to install the local instance of the server
+#
+maven.webserver.dir=${basedir}/server
+
+#
+# The default port to test for a TCP/IP connection listener for determining if
+# the webserver instance is started. Default is the same as the http port
+#
+maven.webserver.test.socket=${maven.webserver.port.http}
+
 #
 # The URL used to test the current running status of the webserver
+# Default is the host and http port
 #
-maven.webserver.url=http://${maven.webserver.host}:${maven.webserver.port.http}/index.html
+maven.webserver.test.url=http://${maven.webserver.host}:${maven.webserver.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 webserver to play friendly
+# with a Tomcat application container by default
 #
 maven.webserver.root=${maven.webserver.dir}/webapps/ROOT
 
+#-------------------------------------------------------#
+
+
+#-------------------------------------------------------#
+# REQUIRED PROPERTIES NOT NORMALLY MODIFIED BY USERS    #
+#-------------------------------------------------------#
+
+# needed for dir searches and messages, should NOT be changed by user
+maven.webserver.fullname=${maven.webserver.name}-${maven.webserver.version}
+
+#
+# where to look for the instance specific config files for this webserver
+#
+maven.webserver.conf.dir=${maven.conf.dir}/webserver/${maven.webserver.fullname}
+
+