Merge branch 'jetty-8' into release-8

VERSION.txt

@@ -1,4 +1,6 @@
-jetty-8.1.7-SNAPSHOT
+jetty-8.1.7.v20120910 - 10 September 2012
+ + 388895 Update dependencies for jetty-jndi
+ + fix busy logging statement re: sessions
 
 jetty-8.1.6.v20120903 - 03 September 2012
  + 347130 Empty getResourcePaths due to ZipFileClosedException

jetty-jndi/pom.xml

@@ -59,9 +59,8 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
+      <artifactId>jetty-server</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>

jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java

@@ -21,7 +21,6 @@ package org.eclipse.jetty.server.session;
 import java.io.IOException;
 import java.util.EnumSet;
 import java.util.EventListener;
-
 import javax.servlet.DispatcherType;
 import javax.servlet.ServletException;
 import javax.servlet.SessionTrackingMode;
@@ -236,7 +235,7 @@ public class SessionHandler extends ScopedHandler
     /* ------------------------------------------------------------ */
     /**
      * Look for a requested session ID in cookies and URI parameters
-     * 
+     *
      * @param baseRequest
      * @param request
      */
@@ -273,7 +272,7 @@ public class SessionHandler extends ScopedHandler
                         requested_session_id = cookies[i].getValue();
                         requested_session_id_from_cookie = true;
 
-                        LOG.info("Got Session ID {} from cookie",requested_session_id);
+                        LOG.debug("Got Session ID {} from cookie",requested_session_id);
 
                         if (requested_session_id != null)
                         {

pom.xml

@@ -394,10 +394,10 @@
     <dependencies>
       <!-- Orbit Deps -->
       <dependency>
-         <groupId>org.eclipse.jetty.orbit</groupId>
-         <artifactId>javax.servlet</artifactId>
-         <version>3.0.0.v201112011016</version>
-       </dependency>
+        <groupId>org.eclipse.jetty.orbit</groupId>
+        <artifactId>javax.servlet</artifactId>
+        <version>${orbit-servlet-api-version}</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.orbit</groupId>
         <artifactId>javax.annotation</artifactId>