314009 'BindException: Address already in use' when explicitly specifying jetty.xml configuration file on command line

Fixing jetty.sh to not include jetty.xml on command line.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1869 7e9141cc-0065-0410-87d8-b60c137991c4

VERSION.txt

@@ -3,6 +3,8 @@ jetty-7.1.3-SNAPSHOT
  + 305898 Websocket handles query string in URI
  + 313205 Unable to run test-jdbc-sessions tests
  + 314177 JSTL support is broken
+ + 314009 BindException: Address already in use' when explicitly specifying
+          jetty.xml configuration file on command line
 
 jetty-7.1.2.v20100523
  + 308866 Update test suite to JUnit4 - Module jetty-util

jetty-distribution/src/main/resources/bin/jetty.sh

@@ -247,38 +247,6 @@ then
   exit 1
 fi
 
-
-###########################################################
-# Get the list of config.xml files from the command line.
-###########################################################
-for ARG
-do
-  if [ -f "$ARG" ]
-  then
-    CONF="$ARG" 
-  elif [ -f "$JETTY_HOME/etc/$ARG" ]
-  then
-    CONF="$JETTY_HOME/etc/$ARG" 
-  elif [ -f "$ARG.xml" ] 
-  then
-    CONF="$ARG.xml" 
-  elif [ -f "$JETTY_HOME/etc/$ARG.xml" ] 
-  then
-    CONF="$JETTY_HOME/etc/$ARG.xml" 
-  else
-    echo "** ERROR: Cannot find configuration '$ARG' specified in the command line." 
-    exit 1
-  fi
-  if [ ! -r "$CONF" ] 
-  then
-    echo "** ERROR: Cannot read configuration '$ARG' specified in the command line." 
-    exit 1
-  fi
-
-  CONFIGS+=("$CONF")
-done
-
-
 ##################################################
 # Try to find this script's configuration file,
 # but only if no configurations were given on the
@@ -329,15 +297,6 @@ then
   done < "$JETTY_CONF"
 fi
 
-#####################################################
-# Run the standard server if there's nothing else to run
-#####################################################
-if [ "${#CONFIGS[@]}" -eq 0 ] 
-then
-  CONFIGS=("$JETTY_HOME/etc/jetty-logging.xml" "$JETTY_HOME/etc/jetty.xml")
-fi
-
-
 #####################################################
 # Find a location for the pid file
 #####################################################