You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/10/27 20:10:25 UTC
svn commit: r1189905 - in /archiva/trunk:
archiva-jetty/src/main/conf/jetty.xml
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
Author: olamy
Date: Thu Oct 27 18:10:24 2011
New Revision: 1189905
URL: http://svn.apache.org/viewvc?rev=1189905&view=rev
Log:
[MRM-1539] Upgrade to Jetty: fix webdav test
Modified:
archiva/trunk/archiva-jetty/src/main/conf/jetty.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
Modified: archiva/trunk/archiva-jetty/src/main/conf/jetty.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty/src/main/conf/jetty.xml?rev=1189905&r1=1189904&r2=1189905&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty/src/main/conf/jetty.xml (original)
+++ archiva/trunk/archiva-jetty/src/main/conf/jetty.xml Thu Oct 27 18:10:24 2011
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java?rev=1189905&r1=1189904&r2=1189905&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java Thu Oct 27 18:10:24 2011
@@ -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 AbstractRepository
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();