392237 improved configuration defaults to match documentation

jetty-distribution/pom.xml

@@ -439,6 +439,7 @@
               <outputDirectory>${assembly-directory}/lib/spdy</outputDirectory>
             </configuration>
           </execution>
+	  <!--
           <execution>
             <id>copy-spdy</id>
             <phase>process-resources</phase>
@@ -460,6 +461,7 @@
               </artifactItems>
             </configuration>
           </execution>
+	  -->
           <execution>
             <id>unpack-spdy</id>
             <phase>process-resources</phase>

jetty-distribution/src/main/resources/start.ini

@@ -8,9 +8,21 @@
 # Use the following command to see more options
 #    java -jar start.jar --help
 #
+# Each line in this file is prepended to the command line
+# as arguments, which may be either:
+#  + A property like: name=value
+#  + A file of properties like: /etc/myjetty.properties
+#  + A classpath option like: OPTION=jmx
+#  + An XML configuration file like: etc/jetty-feature.xml
+#  + A start.jar option like: --dry-run
+#
+# If --exec or --exec-print are used, then this file may also 
+# contain lines with:
+#  + A JVM option like: -Xmx2000m 
+#  + A System Property like: -Dcom.sun.management.jmxremote
+#
 #===========================================================
 
-
 #===========================================================
 # The --exec option should be used if any of the JVM options
 # in this file are uncommented (eg -D* or -X*).  Because a
@@ -30,9 +42,22 @@
 # --exec
 #===========================================================
 
+#===========================================================
+# Configure Properties.
+# The properties defined here may be used by the
+# <Property name="myproperty"/> element in the XML files
+# passed to start.jar.   
+# Alternately a file ending with ".properties" can be 
+# added that will include multiple properties.
+# Properties, unlike SystemProperties, do not need --exec
+# to be specified.
+#-----------------------------------------------------------
+# jetty.port=8080
+#===========================================================
+
 
 #===========================================================
-# Some recommended JVM arguments.
+# Configure JVM arguments.
 # Must be used with --exec or --exec-print
 #-----------------------------------------------------------
 # -Dorg.apache.jasper.compiler.disablejsr199=true
@@ -108,7 +133,7 @@ etc/jetty-http.xml
 #===========================================================
 # HTTPS Connector
 #-----------------------------------------------------------
-etc/jetty-https.xml
+# etc/jetty-https.xml
 #===========================================================
 
 #===========================================================

jetty-distribution/src/main/resources/webapps/README.TXT

@@ -1,13 +1,25 @@
 
-This directory is scanned by the WebAppDeployer provider for
-web applications to deploy.   It may contain:
+This directory is scanned by the WebAppDeployer provider for web
+applications to deploy using the following conventions:
+
++ A directory called example/ will be deployed as a standard web
+application if it contains a WEB-INF/ subdirectory, otherwise it will be
+deployed as context of static content. The context path will be /example
+(eg http://localhost:8080/example/) unless the base name is root, in
+which case the context path is /. If the directory name ends with ".d"
+it is ignored (by may be used by explicit configuration).
+
++ A file called example.war will be deployed as a standard web application
+with the context path /example  (eg http://localhost:8080/example/). If he
+base name is root, then the context path is /. If example.war and example/
+exist, then only the WAR is deployed (which may use the directory as an
+unpack location).
+
++ An XML file like example.xml will be deployed as a context whose
+configuration is defined by the XML. The context path must be set by
+the configuration itself. If example.xml and example.war exist, then
+only the XML is deployed (which may use the war in its configuration).
 
- + standard WAR files
- + directories that are deployed as static content, except for
-   directories ending in ".d", which are ignored.
- + Context XML files that contain XmlConfiguration which 
-   describe individual contexts to be deployed to the server.  
-   
 This directory is scanned for additions, removals and updates 
 for hot deployment.
 

jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt

@@ -14,7 +14,9 @@ Command Line Options:
   --list-options   List the details of each classpath OPTION
   
   --list-config    List the start.config file.
-                                    
+                            
+  --exec-print	   Same as --dry-run
+
   --dry-run        Print the command line that the start.jar generates,
                    then exit. This may be used to generate command lines
                    when the start.ini includes -X or -D arguments.
@@ -25,6 +27,8 @@ Command Line Options:
                    JVM instance.
                      
   --stop           Send a stop signal to the running Jetty instance.
+                   The server must have been started with a STOP.PORT=<port>
+		   property set and the stop command must have the same property.
   
   --stop-wait      Send a stop signal to the running Jetty instance, waiting for
                    confirmation that it is stopping.