Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use more recent jetty version 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1392950 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-10-02 15:11:33 +00:00
parent f2893abda1
commit 163e2753eb
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archiva-modules/archiva-base/archiva-proxy/pom.xml
View File

@ -123,9 +123,8 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mortbay.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty</artifactId> <artifactId>jetty-server</artifactId>
<version>6.1.11</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

13
archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnector.java
View File

@ -29,8 +29,6 @@ import java.util.Map;
/** /**
* This represents a connector for a repository to repository proxy. * This represents a connector for a repository to repository proxy.
*
*
*/ */
public class ProxyConnector public class ProxyConnector
implements RepositoryConnector implements RepositoryConnector
@ -44,19 +42,24 @@ public class ProxyConnector
private List<String> whitelist; private List<String> whitelist;
private String proxyId; private String proxyId;
private int order; private int order;
private Map<String, String> policies; private Map<String, String> policies;
private boolean disabled; private boolean disabled;
public ProxyConnector()
{
// no op
}
public boolean isDisabled() public boolean isDisabled()
{ {
return disabled; return disabled;
} }
public void setDisabled(boolean disabled) public void setDisabled( boolean disabled )
{ {
this.disabled = disabled; this.disabled = disabled;
} }

20
archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java
View File

@ -35,14 +35,14 @@ import org.apache.archiva.policies.PropagateErrorsOnUpdateDownloadPolicy;
import org.apache.archiva.policies.ReleasesPolicy; import org.apache.archiva.policies.ReleasesPolicy;
import org.apache.archiva.policies.SnapshotsPolicy; import org.apache.archiva.policies.SnapshotsPolicy;
import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.ManagedRepositoryContent;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mortbay.jetty.Handler;
import org.mortbay.jetty.Request;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.handler.AbstractHandler;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
@ -137,6 +137,18 @@ public class HttpProxyTransferTest
Handler handler = new AbstractHandler() Handler handler = new AbstractHandler()
{ {
public void handle( String s, Request request, HttpServletRequest httpServletRequest,
HttpServletResponse response )
throws IOException, ServletException
{
response.setContentType( "text/plain" );
response.setStatus( HttpServletResponse.SC_OK );
response.getWriter().print( "get-default-layout-1.0.jar\n\n" );
assertNotNull( request.getHeader( "Proxy-Connection" ) );
( (Request) request ).setHandled( true );
}
public void handle( String target, HttpServletRequest request, HttpServletResponse response, int dispatch ) public void handle( String target, HttpServletRequest request, HttpServletResponse response, int dispatch )
throws IOException, ServletException throws IOException, ServletException
{ {