You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/11/05 07:30:19 UTC
svn commit: r711518 - in
/maven/mercury/trunk/mercury-transport/mercury-transport-http: ./
src/main/java/org/apache/maven/mercury/spi/http/client/
src/test/java/org/apache/maven/mercury/spi/http/server/
Author: ogusakov
Date: Tue Nov 4 22:30:18 2008
New Revision: 711518
URL: http://svn.apache.org/viewvc?rev=711518&view=rev
Log:
uprev to jetty 6.1.12
Modified:
maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/DestinationRealmResolver.java
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/AuthenticatingProxyServer.java
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml?rev=711518&r1=711517&r2=711518&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml Tue Nov 4 22:30:18 2008
@@ -9,9 +9,13 @@
<version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
-<build>
+ <properties>
+ <jetty.version>6.1.12</jetty.version>
+ </properties>
-<plugins>
+ <build>
+
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -28,24 +32,22 @@
</build>
-
-
<dependencies>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>6.1.12.rc2</version>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
- <version>6.1.12.rc2</version>
+ <version>${jetty.version}</version>
</dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-servlet-tester</artifactId>
- <version>6.1.12.rc2</version>
+ <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<!-- Mercury Dependencies -->
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/DestinationRealmResolver.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/DestinationRealmResolver.java?rev=711518&r1=711517&r2=711518&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/DestinationRealmResolver.java (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/DestinationRealmResolver.java Tue Nov 4 22:30:18 2008
@@ -27,6 +27,7 @@
import org.apache.maven.mercury.logging.IMercuryLogger;
import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.transport.api.Server;
+import org.mortbay.jetty.client.Address;
import org.mortbay.jetty.client.HttpDestination;
import org.mortbay.jetty.client.security.Realm;
import org.mortbay.jetty.client.security.RealmResolver;
@@ -53,12 +54,12 @@
public Realm getRealm(String name, HttpDestination dest, String pathSpec)
throws IOException
{
- InetSocketAddress address = dest.getAddress();
+ Address address = dest.getAddress();
boolean secure = dest.isSecure();
if( _log.isDebugEnabled() )
{
- _log.debug("Dest "+address.getHostName()+":"+address.getPort()+"(secure="+secure+")" );
+ _log.debug("Dest "+address.getHost()+":"+address.getPort()+"(secure="+secure+")" );
_log.debug("Server list: "+_servers );
}
@@ -81,18 +82,18 @@
}
if( _log.isDebugEnabled() )
- _log.debug("Trying dest "+address.getHostName()+":"+address.getPort()+"(secure="+dest.isSecure()
+ _log.debug("Trying dest "+address.getHost()+":"+address.getPort()+"(secure="+dest.isSecure()
+") against server "+protocol+"://"+host+":"+port );
if (((secure && "https".equalsIgnoreCase(protocol)) || (!secure && "http".equalsIgnoreCase(protocol)))
&&
(address.getPort() == port))
{
- if (address.getHostName().equalsIgnoreCase(host) || address.getAddress().getHostAddress().equalsIgnoreCase(host))
+ if (address.getHost().equalsIgnoreCase(host) || address.getHost().equalsIgnoreCase(host))
{
server = s;
if (_log.isDebugEnabled())
- _log.debug("Matched server "+address.getHostName()+":"+address.getPort());
+ _log.debug("Matched server "+address.getHost()+":"+address.getPort());
}
}
}
@@ -101,7 +102,7 @@
if (server == null || server.getServerCredentials() == null)
{
if (_log.isDebugEnabled())
- _log.debug("No server matching "+address.getHostName()+":"+address.getPort()+" or no credentials");
+ _log.debug("No server matching "+address.getHost()+":"+address.getPort()+" or no credentials");
return null;
}
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java?rev=711518&r1=711517&r2=711518&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java Tue Nov 4 22:30:18 2008
@@ -27,6 +27,7 @@
import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.transport.api.Credentials;
import org.apache.maven.mercury.transport.api.Server;
+import org.mortbay.jetty.client.Address;
import org.mortbay.jetty.client.HttpClient;
import org.mortbay.jetty.client.HttpDestination;
import org.mortbay.jetty.client.HttpExchange;
@@ -55,7 +56,7 @@
URI uri = new URI(s);
boolean ssl = "https".equalsIgnoreCase(uri.getScheme());
URL proxy = server.getProxy();
-
+
String host = proxy.getHost();
int port = proxy.getPort();
boolean proxySsl = "https".equalsIgnoreCase(proxy.getProtocol());
@@ -63,17 +64,17 @@
{
port = proxySsl?443:80;
}
- InetSocketAddress proxyAddress = new InetSocketAddress(host,port);
+
+ Address proxyAddress = new Address(host,port);
HttpDestination destination = httpClient.getDestination(exchange.getAddress(), ssl);
if( _log.isDebugEnabled() )
- _log.debug("Matched destination "+destination);
+ _log.debug("Matched destination "+destination);
destination.setProxy(proxyAddress);
if( _log.isDebugEnabled() )
- _log.debug("Set proxy "+host+":"+port+" on destination");
-_log.info("Set proxy "+host+":"+port+" on destination");
-System.out.println("Set proxy "+host+":"+port+" on destination");
-
+ _log.debug("Set proxy "+host+":"+port+" on destination");
+ _log.info("Set proxy "+host+":"+port+" on destination");
+
//set up authentication for the proxy
Credentials proxyCredentials = server.getProxyCredentials();
@@ -85,7 +86,7 @@
{
destination.setProxyAuthentication(new ProxyAuthorization (proxyCredentials.getUser(), proxyCredentials.getPass()));
if( _log.isDebugEnabled() )
- _log.debug( "Set proxy authentication: "+proxyCredentials.getUser()+":"+proxyCredentials.getPass());
+ _log.debug( "Set proxy authentication: "+proxyCredentials.getUser()+":"+proxyCredentials.getPass());
}
}
destination.send(exchange);
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/AuthenticatingProxyServer.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/AuthenticatingProxyServer.java?rev=711518&r1=711517&r2=711518&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/AuthenticatingProxyServer.java (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/AuthenticatingProxyServer.java Tue Nov 4 22:30:18 2008
@@ -53,10 +53,11 @@
String proxyAuth = ((HttpServletRequest)request).getHeader("Proxy-Authorization");
if (proxyAuth!=null)
{
-
- if (proxyAuth.startsWith("basic "))
+ String authType = proxyAuth.substring(0,6);
+
+ if (authType.equalsIgnoreCase("basic "))
proxyAuth = proxyAuth.substring(6);
-
+
proxyAuth = B64Code.decode(proxyAuth,StringUtil.__ISO_8859_1);
int sep = proxyAuth.indexOf(":");
String username = proxyAuth.substring(0,sep);