Merge remote-tracking branch 'origin/jetty-7' into jetty-8

Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java

2 files changed, 10 insertions, 8 deletions

diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Config.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Config.java
index 0235a760cf..f6249ccaf6 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Config.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Config.java
@@ -38,6 +38,7 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -269,7 +270,7 @@ public class Config
             }
             else
             {
-                String name = entry.getName().toLowerCase();
+                String name = entry.getName().toLowerCase(Locale.ENGLISH);
                 if (name.endsWith(".jar") || name.endsWith(".zip"))
                 {
                     String jar = entry.getCanonicalPath();
@@ -796,7 +797,7 @@ public class Config
                     }
 
                     // Add XML configuration
-                    if (subject.toLowerCase().endsWith(".xml"))
+                    if (subject.toLowerCase(Locale.ENGLISH).endsWith(".xml"))
                     {
                         // Config file
                         File f = new File(fixPath(file));
@@ -807,7 +808,7 @@ public class Config
                     }
 
                     // Set the main class to execute (overrides any previously set)
-                    if (subject.toLowerCase().endsWith(".class"))
+                    if (subject.toLowerCase(Locale.ENGLISH).endsWith(".class"))
                     {
                         // Class
                         String cn = expand(subject.substring(0,subject.length() - 6));
@@ -820,7 +821,7 @@ public class Config
                     }
 
                     // Add raw classpath entry
-                    if (subject.toLowerCase().endsWith(".path"))
+                    if (subject.toLowerCase(Locale.ENGLISH).endsWith(".path"))
                     {
                         // classpath (jetty.class.path?) to add to runtime classpath
                         String cn = expand(subject.substring(0,subject.length() - 5));
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
index 9726742630..dabd5385f6 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
@@ -46,6 +46,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Properties;
 import java.util.Set;
 
@@ -154,7 +155,7 @@ public class Main
             {
                 public boolean accept(File dir, String name)
                 {
-                    return name.toLowerCase().endsWith(".ini");
+                    return name.toLowerCase(Locale.ENGLISH).endsWith(".ini");
                 }
             });
             Arrays.sort(inis);
@@ -385,7 +386,7 @@ public class Main
                                     return false;
                                 }
 
-                                String name = path.getName().toLowerCase();
+                                String name = path.getName(Locale.ENGLISH).toLowerCase();
                                 return (name.startsWith("jetty") && name.endsWith(".xml"));
                             }
                         });
@@ -659,7 +660,7 @@ public class Main
 
     private String resolveXmlConfig(String xmlFilename) throws FileNotFoundException
     {
-        if (!xmlFilename.toLowerCase().endsWith(".xml"))
+        if (!xmlFilename.toLowerCase(Locale.ENGLISH).endsWith(".xml"))
         {
             // Nothing to resolve.
             return xmlFilename;
@@ -873,7 +874,7 @@ public class Main
 
         if (element.isFile())
         {
-            String name = element.getName().toLowerCase();
+            String name = element.getName().toLowerCase(Locale.ENGLISH);
             if (name.endsWith(".jar"))
             {
                 return JarVersion.getVersion(element);