From a7fdbde808d0ead9394fb6278bc77a699ef19965 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <greg@webtide.com>
Date: Fri, 23 Apr 2010 15:56:54 +0000
Subject: [PATCH] no debug

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1555 7e9141cc-0065-0410-87d8-b60c137991c4
---
 jetty-jsp-2.1/pom.xml                               | 13 +++++++++++++
 .../server/handler/AbstractProxyHandlerTest.java    |  2 +-
 .../org/eclipse/jetty/webapp/WebAppContext.java     |  5 ++---
 test-continuation-jetty6/pom.xml                    |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/jetty-jsp-2.1/pom.xml b/jetty-jsp-2.1/pom.xml
index 934c91d032e..366e265fc3f 100644
--- a/jetty-jsp-2.1/pom.xml
+++ b/jetty-jsp-2.1/pom.xml
@@ -14,6 +14,19 @@
   </properties>
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>${felix.bundle.version}</version>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+           </execution>
+        </executions>
+      </plugin>
       <plugin>
         <!--
         Required for OSGI
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/AbstractProxyHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/AbstractProxyHandlerTest.java
index 8240322759f..5e2eac3cff4 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/AbstractProxyHandlerTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/AbstractProxyHandlerTest.java
@@ -125,7 +125,7 @@ public abstract class AbstractProxyHandlerTest extends TestCase
     protected Socket newSocket() throws IOException
     {
         Socket socket = new Socket("localhost", proxyConnector.getLocalPort());
-        socket.setSoTimeout(500000);
+        socket.setSoTimeout(5000);
         return socket;
     }
 
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
index d41f64089c3..40acf2ce12e 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
@@ -663,9 +663,8 @@ public class WebAppContext extends ServletContextHandler
             return;
 
         //if the configuration classnames have been set explicitly use them
-        if (!_configurationClassesSet){
-            System.err.println("DEFAULTS");
-            _configurationClasses=__dftConfigurationClasses;}
+        if (!_configurationClassesSet)
+            _configurationClasses=__dftConfigurationClasses;
 
         _configurations = new Configuration[_configurationClasses.length];
         for (int i = 0; i < _configurationClasses.length; i++)
diff --git a/test-continuation-jetty6/pom.xml b/test-continuation-jetty6/pom.xml
index 09911928518..0e3cfdcfce0 100644
--- a/test-continuation-jetty6/pom.xml
+++ b/test-continuation-jetty6/pom.xml
@@ -32,7 +32,7 @@
     <dependency>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty</artifactId>
-        <version>6.1.15</version>
+        <version>6.1.24</version>
         <type>jar</type>
         <scope>test</scope>
         <exclusions>