328872 - Multi Jetty xml files not loading if directory is referenced in jetty.conf

* Fixed foreach variable name. changed from bad mix of "file" and "FILE"
  to a more consistent "XMLFILE" variable.

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

VERSION.txt

@@ -3,6 +3,7 @@ jetty-7.3.0-SNAPSHOT
  + JETTY-1259 NullPointerException in JDBCSessionIdManager when invalidating session (further update)
  + 320457 add SPNEGO support
  + 324505 Implement API login
+ + 328872 Multi Jetty xml files not loading if directory is referenced in jetty.conf
  + 332179 Fixed formatting of negative dates
  + 332432 Scanner.java now always scanning the canonical form of File
  + 332517 Improved DefaultServlet debug

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

@@ -286,13 +286,13 @@ then
       # assume it's a directory with configure.xml files
       # for example: /etc/jetty.d/
       # sort the files before adding them to the list of CONFIGS
-      for file in "$CONF/"*.xml
+      for XMLFILE in "$CONF/"*.xml
       do
-        if [ -r "$FILE" ] && [ -f "$FILE" ] 
+        if [ -r "$XMLFILE" ] && [ -f "$XMLFILE" ] 
         then
-          CONFIGS+=("$FILE")
+          CONFIGS+=("$XMLFILE")
         else
-          echo "** WARNING: Cannot read '$FILE' specified in '$JETTY_CONF'" 
+          echo "** WARNING: Cannot read '$XMLFILE' specified in '$JETTY_CONF'" 
         fi
       done
     else