Merge remote-tracking branch 'davehunt/add-defaults' into pull20

README.md

@@ -59,19 +59,19 @@ example a value of `2.0b3` will load the library
 
 The host of the Selenium RC that you want to register with the Selenium Grid
 hub. This is needed so that Selenium Grid can communicate back to the server.
-This property should not be set in `project.properties` because it will differ
-for each machine. It's best placed in the `<HOSTNAME>.project.properties` file.
+This defaults to `localhost`, which is fine if the server is on the same machine
+as the Selenium Grid hub. If these are on different machines then this property
+is best set in `<HOSTNAME>.project.properties` file or on the command line. See
+the section on **Launching a Selenium RC server** below for details.
 
 **rc.port**
 
 The port of the Selenium RC that you want to register with the Selenium Grid
 hub. Along with the host, this is needed so that Selenium Grid can communicate
-back to the server. This property should not be set in `project.properties`
-because it will differ for each machine, and it should also not be set in
-`<HOSTNAME>.project.properties` file as you are likely to want to invoke
-multiple servers on each machine. The best way to set this property is via the
-command line. See the section on **Launching a Selenium RC server** below for
-details.
+back to the server. This defaults to `5555`, which is fine for the first server
+on a machine, but any subsequent servers need a different port to be specified
+via the command line. See the section on **Launching a Selenium RC server**
+below for details.
 
 **rc.environment**
 

build.xml

@@ -51,7 +51,9 @@
   </target>
 
   <target name="launch-remote-control-with-custom-profile" depends="check-for-custom-profile" if="use.custom.profile">
-    <fail unless="rc.host" message="Property rc.host must be set in ${env.HOSTNAME}.project.properties" /> 
+    <fail unless="rc.host" message="Property rc.host must be set in ${env.HOSTNAME}.project.properties" />
+    <fail unless="rc.port" message="Property rc.port must be set in ${env.HOSTNAME}.project.properties" />
+    <fail unless="rc.environment" message="Property rc.environment must be set on the command line. Example: -Drc.environment='Firefox Beta on Mac OS X'" /> 
     <java classpathref="remote-control.classpath"
           classname="com.thoughtworks.selenium.grid.remotecontrol.SelfRegisteringRemoteControlLauncher"
           fork="true"
@@ -73,6 +75,9 @@
   </target>
 
   <target name="launch-remote-control-without-custom-profile" depends="check-for-custom-profile" unless="use.custom.profile">
+    <fail unless="rc.host" message="Property rc.host must be set in ${env.HOSTNAME}.project.properties" />
+    <fail unless="rc.port" message="Property rc.port must be set in ${env.HOSTNAME}.project.properties" />
+    <fail unless="rc.environment" message="Property rc.environment must be set on the command line. Example: -Drc.environment='Firefox Beta on Mac OS X'" /> 
     <java classpathref="remote-control.classpath"
           classname="com.thoughtworks.selenium.grid.remotecontrol.SelfRegisteringRemoteControlLauncher"
           fork="true"

project.properties

@@ -4,6 +4,8 @@ hub.host=qa-selenium.mv.mozilla.com
 hub.port=4444
 
 rc.version=2.0.0
+rc.host=localhost
+rc.port=5555
 rc.arguments=
 
 custom.firefox.profile=certificateExceptions