[MRM-1539] Upgrade to Jetty: fix webdav test

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1189905 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-jetty/src/main/conf/jetty.xml b/archiva-jetty/src/main/conf/jetty.xml
index 6eff16d798a3556fa1bf083307be20d062f11138..92e45b07ab4d205a3030de97ac280f43b2e485e2 100644 (file)
--- a/archiva-jetty/src/main/conf/jetty.xml
+++ b/archiva-jetty/src/main/conf/jetty.xml
@@ -68,8 +68,8 @@
             <Set name="Acceptors">2</Set>
             <Set name="statsOn">false</Set>
             <Set name="confidentialPort">8443</Set>
-           <Set name="lowResourcesConnections">5000</Set>
-           <Set name="lowResourcesMaxIdleTime">5000</Set>
+                 <Set name="lowResourcesConnections">5000</Set>
+                 <Set name="lowResourcesMaxIdleTime">5000</Set>
           </New>
       </Arg>
     </Call>

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
index ad79464b3e92ab4d3d4853166f8d4aa9f4b2b83c..b16834dd39a3fd99c61ff7d6ae099c251267703e 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
@@ -21,20 +21,22 @@ package org.apache.archiva.webdav;
 
 import com.meterware.httpunit.WebConversation;
 import com.meterware.httpunit.WebResponse;
-import org.apache.commons.io.FileUtils;
 import org.apache.archiva.configuration.ProxyConnectorConfiguration;
 import org.apache.archiva.configuration.RemoteRepositoryConfiguration;
 import org.apache.archiva.policies.CachedFailuresPolicy;
 import org.apache.archiva.policies.ChecksumPolicy;
 import org.apache.archiva.policies.ReleasesPolicy;
 import org.apache.archiva.policies.SnapshotsPolicy;
+import org.apache.commons.io.FileUtils;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.server.handler.ContextHandlerCollection;
+import org.eclipse.jetty.servlet.DefaultServlet;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
 import org.junit.After;
 import org.junit.Before;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.ContextHandler;
-import org.mortbay.jetty.handler.ContextHandlerCollection;
-import org.mortbay.jetty.servlet.DefaultServlet;
-import org.mortbay.jetty.servlet.ServletHandler;
 
 import java.io.File;
 
@@ -122,14 +124,15 @@ public abstract class AbstractRepositoryServletProxiedTestCase
         ContextHandlerCollection contexts = new ContextHandlerCollection();
         repo.server.setHandler( contexts );
 
-        ContextHandler context = new ContextHandler();
+        ServletContextHandler context = new ServletContextHandler();
         context.setContextPath( repo.context );
         context.setResourceBase( repo.root.getAbsolutePath() );
         context.setAttribute( "dirAllowed", true );
         context.setAttribute( "maxCacheSize", 0 );
-        ServletHandler servlet = new ServletHandler();
-        servlet.addServletWithMapping( DefaultServlet.class.getName(), "/" );
-        context.setHandler( servlet );
+
+        ServletHolder sh = new ServletHolder( DefaultServlet.class );
+        context.addServlet( sh, "/" );
+
         contexts.addHandler( context );
 
         repo.server.start();