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

Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
	jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
	jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
	jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
	test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
	test-jetty-webapp/src/main/java/com/acme/Dump.java

2 files changed, 8 insertions, 6 deletions

diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
index 61aa16509d..8b301d8035 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
@@ -22,6 +22,7 @@ import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.util.Locale;
 
 import org.eclipse.jetty.deploy.App;
 import org.eclipse.jetty.deploy.ConfigurationManager;
@@ -77,7 +78,7 @@ public class WebAppProvider extends ScanningAppProvider
             {
                 return false;
             }
-            String lowername = name.toLowerCase();
+            String lowername = name.toLowerCase(Locale.ENGLISH);
             
             File file = new File(dir,name);
             
@@ -299,9 +300,9 @@ public class WebAppProvider extends ScanningAppProvider
         {
             context = URIUtil.SLASH;
         }
-        else if (context.toLowerCase().startsWith("root-"))
+        else if (context.toLowerCase(Locale.ENGLISH).startsWith("root-"))
         {
-            int dash=context.toLowerCase().indexOf('-');
+            int dash=context.toLowerCase(Locale.ENGLISH).indexOf('-');
             String virtual = context.substring(dash+1);
             wah.setVirtualHosts(new String[]{virtual});
             context = URIUtil.SLASH;
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/util/FileID.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/util/FileID.java
index cda1fe21a8..7df726926f 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/util/FileID.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/util/FileID.java
@@ -19,6 +19,7 @@
 package org.eclipse.jetty.deploy.util;
 
 import java.io.File;
+import java.util.Locale;
 
 /**
  * Simple, yet surprisingly common utility methods for identifying various file types commonly seen and worked with in a
@@ -38,7 +39,7 @@ public class FileID
     {
         if (path.isFile())
         {
-            String name = path.getName().toLowerCase();
+            String name = path.getName().toLowerCase(Locale.ENGLISH);
             return (name.endsWith(".war") || name.endsWith(".jar"));
         }
 
@@ -62,7 +63,7 @@ public class FileID
             return false;
         }
 
-        String name = path.getName().toLowerCase();
+        String name = path.getName().toLowerCase(Locale.ENGLISH);
         return (name.endsWith(".war") || name.endsWith(".jar"));
     }
 
@@ -73,7 +74,7 @@ public class FileID
             return false;
         }
 
-        String name = path.getName().toLowerCase();
+        String name = path.getName().toLowerCase(Locale.ENGLISH);
         return name.endsWith(".xml");
     }
 }