Merge branch 'jetty-8' into release-8

VERSION.txt

@@ -1256,7 +1256,7 @@ jetty-7.0.2.RC0
  + Added IPAccessHandler
  + Updated Servlet3Continuation to final 3.0.20100224
  + 305997 Coalesce buffers in ChannelEndPoint.flush()
- + 306028 Enable TCP_NODELAY by default in client connectors <<<<<<< HEAD
+ + 306028 Enable TCP_NODELAY by default in client connectors
 
 jetty-8.0.0.M0 - 28 February 2010
  + Updated servlet 3.0 spec 20100224
@@ -1264,10 +1264,6 @@ jetty-8.0.0.M0 - 28 February 2010
  + Updated to cometd 1.0.1
 
 jetty-7.0.1.v20091125 - 25 November 2009
- + =======
-
-jetty-7.0.1.v20091125 - 25 November 2009
- + >>>>>>> origin/master
  + 274251 DefaultServlet supports exact match mode.
  + 288401 HttpExchange.cancel() Method Unimplemented
  + 289027 deobfuscate HttpClient SSL passwords

jetty-aggregate/jetty-all-server/pom.xml

@@ -115,7 +115,7 @@
         </plugins>
     </build>
 
- <dependencies>
+    <dependencies>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-deploy</artifactId>

jetty-aggregate/jetty-all/pom.xml

@@ -92,7 +92,7 @@
     </plugins>
   </build>
 
-<dependencies>
+  <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>

jetty-continuation/pom.xml

@@ -64,9 +64,9 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId> 
-      <artifactId>servlet-api</artifactId>
-      <version>3.0.20100224</version>
+      <groupId>org.eclipse.jetty.orbit</groupId> 
+      <artifactId>javax.servlet</artifactId>
+      <version>3.0.0.v201112011016</version>
       <scope>provided</scope>
     </dependency> 
     <dependency>

jetty-spdy/spdy-jetty-http-webapp/src/main/config/etc/jetty-spdy.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
-<Configure id="server" class="org.eclipse.jetty.server.Server">
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
 
     <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
         <Set name="keyStorePath">src/main/resources/keystore.jks</Set>

test-jetty-webapp/pom.xml

@@ -76,7 +76,7 @@
             </goals>
             <configuration>
               <instructions>
-		<Bundle-SymbolicName>org.eclipse.jetty.test-jetty-webapp</Bundle-SymbolicName>
+                <Bundle-SymbolicName>org.eclipse.jetty.test-jetty-webapp</Bundle-SymbolicName>
                 <Import-Package>javax.servlet,org.eclipse.jetty.servlets,*</Import-Package>
                 <Export-Package>!com.acme*</Export-Package>
                 <!-- the test webapp is configured via a jetty xml file